diff --git a/.github/.metadata.json b/.github/.metadata.json
index 8c6795717de..cc566612660 100644
--- a/.github/.metadata.json
+++ b/.github/.metadata.json
@@ -1,19 +1,19 @@
 {
-  "templateVersion": "0.1",
+  "templateVersion": "0.2",
   "product": {
     "name": "Magento 2 Page Builder",
     "description": "Page Builder introduces an intuitive, drag-and-drop interface for creating digital content, powered by content types like images, videos, banners, etc. with instant preview capabilities that enable non-technical users to take control of their content."
   },
   "contacts": {
     "team": {
-      "name": "Amigos",
-      "DL": "Grp-amigos",
-      "slackChannel": "team-amigos"
+      "name": "Bluetooth",
+      "DL": "Grp-RQ-BLUETOOTH",
+      "slackChannel": ""
     }
   },
   "ticketTracker": {
     "functionalJiraQueue": {
-      "projectKey": "PB",
+      "projectKey": "AC",
       "component": ""
     },
     "securityJiraQueue": {
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9051bb359ba..32754ac24ad 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 Contributions to the Magento 2 Page Builder codebase are done using the fork & pull model.
 This contribution model has contributors maintaining their own fork of the Magento 2 Page Builder repository.
-The forked repository is then used to submit a request to the base repository to “pull” a set of changes.
+The forked repository is then used to submit a request to the base repository to "pull" a set of changes.
 For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).
 
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.
@@ -15,13 +15,13 @@ For more detailed information on contribution please read our [beginners guide](
 
 ## Contribution requirements
 
-1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.4/coding-standards/bk-coding-standards.html).
+1. Contributions must adhere to the [Magento coding standards](https://developer.adobe.com/commerce/php/coding-standards/).
 1. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
 1. Commits must be accompanied by meaningful commit messages. Please see the [Magento 2 Page Builder Pull Request Template](PULL_REQUEST_TEMPLATE.md) for more information.
 1. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 1. PRs which include new logic or new features must be submitted along with:
    * Unit/integration test coverage
-   * Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+   * Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
 1. For larger features or changes, please [open an issue](https://github.com/magento/magento2-page-builder/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
 
 ## Contribution process
@@ -33,7 +33,7 @@ This will allow you to collaborate with the Magento 2 Page Builder development t
 1. Search current [listed issues](https://github.com/magento/magento2-page-builder/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
 2. Review the [Contributor License Agreement](https://opensource.adobe.com/cla.html) if this is your first time contributing.
 3. Create and test your work.
-4. Fork the Magento 2 Page Builder repository according to the [Fork A Repository instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://devdocs.magento.com/guides/v2.4/contributor-guide/contributing.html#pull_request).
+4. Fork the Magento 2 Page Builder repository according to the [Fork A Repository instructions](https://developer.adobe.com/commerce/contributor/guides/code-contributions/) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](https://developer.adobe.com/commerce/contributor/guides/code-contributions/).
 5. Once your contribution is received the Magento 2 Page Builder development team will review the contribution and collaborate with you as needed.
 
 ## Code of Conduct
diff --git a/.github/app-projects-boards-automation.config.yaml b/.github/app-projects-boards-automation.config.yaml
new file mode 100644
index 00000000000..ce19149199f
--- /dev/null
+++ b/.github/app-projects-boards-automation.config.yaml
@@ -0,0 +1,310 @@
+automations:
+
+  ############################################################################################################
+  # PR Automation for Community Dashboard - PageBuilder                                                                                            #
+  ############################################################################################################
+  # 1. Whenever a pull request is labeled with the "Project: Community Picked" label:
+  #   a. it must be assigned to the "Community Dashboard" project
+  #   b. it must be removed from the "Pull Requests Dashboard" project
+  - trigger: pull_request.labeled
+    conditions:
+      - ['modifiedLabel.name', 'eq', 'Project: Community Picked']
+      - [ 'projects#number', 'in', 24 ]
+      - ['projectsByNumber.24.column.name', 'eq', 'Ready for Review']
+    actions:
+      - addToProject: [17] #['Community Dashboard']
+      - moveTo: [17, 'Pending Review']
+      - removeFromProject: [24] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'Changes Requested' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'Changes Requested' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'Reviewer Approved' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'Ready for Testing' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'On Hold' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'On Hold' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'Acceptance Testing' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'Testing in Progress' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'Ready for Delivery' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'Merge in Progress' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'Done' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'Recently Merged' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  - trigger: pull_request.labeled
+    conditions:
+      - [ 'modifiedLabel.name', 'eq', 'Project: Community Picked' ]
+      - [ 'projects#number', 'in', 24 ]
+      - [ 'projectsByNumber.24.column.name', 'eq', 'Review in Progress' ]
+    actions:
+      - addToProject: [ 17 ] #['Community Dashboard']
+      - moveTo: [ 17, 'Review in Progress' ]
+      - removeFromProject: [ 24 ] #['Pull Requests Dashboard']
+
+  # 2. Whenever a pull request is labeled with the "Priority: XX" label and has no "Project: Community Picked" label assigned:
+  #   a. it must be assigned to the "Pull Requests Dashboard" project
+  #   b. it must be removed from the "Community Dashboard" project (if assigned to it)
+  #   c. it must be labeled with the "Progress: pending review" label
+  #   d. it must be moved to the "Pending review" column on the "Pull Requests Dashboard" project
+  - trigger: pull_request.labeled
+    conditions:
+      - ['modifiedLabel.name', 'includes', 'Priority:']
+      - ['labels#name', 'ne', 'Project: Community Picked']
+    actions:
+      - addToProject: [24] #['Pull Requests Dashboard']
+      - moveTo: [24, 'Ready for Review']
+      - removeFromProject: [17] #['Community Dashboard']
+      - addLabels: ['Progress: pending review']
+
+  # 3. Whenever a review was requested for a pull request and its not in Changes Requested
+  #   a. it must be labeled with the "Progress: review" label
+  #   b. it must remove the "Progress: needs update" label
+  #   c. it must be moved to the "Review in Progress" column
+  - trigger: pull_request.review_requested
+    conditions:
+    actions:
+      - addLabels: ['Progress: review']
+      - removeLabels: ['Progress: needs update', 'Progress: pending review']
+      - moveTo: [24, 'Review in Progress'] #['Pull Requests Dashboard', 'Review in Progress']
+      - moveTo: [17, 'Review in Progress'] #['Community Dashboard', 'Review in Progress']
+
+  # 4. Whenever a pull request is labeled with the "Progress: needs update" label and the reviewer adds comment/s:
+  #   a. it must be moved to the "Changes Requested" column
+  - trigger: pull_request.labeled
+    conditions:
+      - ['modifiedLabel.name', 'eq', 'Progress: needs update']
+    actions:
+      - removeLabels: [ 'Progress: review' ]
+      - moveTo: [24, 'Changes Requested'] #['Pull Requests Dashboard', 'Changes Requested']
+      - moveTo: [17, 'Changes Requested'] #['Community Dashboard', 'Changes Requested']
+
+  # 5. Whenever a label "Progress: needs update" is removed from a pull request:
+  #   a. it must be labeled with "Progress: review"
+  #   b. it must be moved to the "Review in Progress" column
+  - trigger: pull_request.unlabeled
+    conditions:
+      - ['modifiedLabel.name', 'eq', 'Progress: needs update']
+    actions:
+      - removeLabels: ['Progress: review']
+      - addLabels: ['Progress: pending review']
+      - moveTo: [24, 'Ready for Review'] #['Pull Requests Dashboard', 'Review in Progress']
+      - moveTo: [17, 'Pending Review'] #['Community Dashboard', 'Review in Progress']
+
+  # 6. Whenever a pull request is approved:
+  #   a. the below labels must be removed from a pull request: "Progress: review", "Progress: needs update"
+  #   b. it must be moved to the "Ready for Testing" column
+  - trigger: pull_request_review.submitted
+    conditions:
+      - ['review', 'eq', 'approved']
+    actions:
+      - removeLabels: ['Progress: review']
+      - moveTo: [24, 'Reviewer Approved'] #['Pull Requests Dashboard', 'Reviewer Approved']
+      - moveTo: [17, 'Ready for Testing'] #['Community Dashboard', 'Ready for Testing']
+
+  # 7. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Pending review" column:
+  #   a. it must be labeled with the "Progress: pending review" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - [
+          ['movedToColumn.name', 'eq', 'Pending Review'],
+          ['movedToColumn.name', 'eq', 'Ready for Review']
+        ]
+      - [
+          ['projects#number', 'in', 17],
+          ['projects#number', 'in', 24]
+        ]
+    actions:
+      - addLabels: ['Progress: pending review']
+      - removeLabels: ['Progress: needs update']
+
+  # 8. Whenever a pull request is in the "Ready for Testing" column and gets assigned to anyone:
+  #   a. it must be labeled with the "Progress: testing in progress" label
+  #   b. it must remove the "Progress: ready for testing" label
+  #   c. it must be moved to the "Testing in Progress" column
+  - trigger: pull_request.assigned
+    conditions:
+      - [
+          ['projects#column.name', 'in', 'Ready for Testing'],
+          ['projects#column.name', 'in', 'Reviewer Approved']
+        ]
+    actions:
+      - addLabels: ['Progress: Testing in Progress']
+      - removeLabels: ['Progress: ready for testing']
+      - moveTo: [24, 'Acceptance Testing'] #['Pull Requests Dashboard', 'Acceptance Testing']
+      - moveTo: [17, 'Testing in Progress'] #['Community Dashboard', 'Testing in Progress']
+
+  # 9. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Review in Progress" column:
+  #   a. it must be labeled with the "Progress: review" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - ['movedToColumn.name', 'eq', 'Review in Progress']
+      - [
+          ['projects#number', 'in', 17],
+          ['projects#number', 'in', 24]
+        ]
+    actions:
+      - addLabels: ['Progress: review']
+      - removeLabels: ['Progress: needs update']
+
+  # 10. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Changes Requested" column:
+  #   a. it must be labeled with the "Progress: needs updates" label
+  #   b. it must remove the "Progress: review" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - ['movedToColumn.name', 'eq', 'Changes Requested']
+      - [
+          ['projects#number', 'in', 17],
+          ['projects#number', 'in', 24]
+        ]
+    actions:
+      - addLabels: ['Progress: needs update']
+      - removeLabels: ['Progress: review']
+
+  # 11. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "On Hold" column:
+  #   a. it must be labeled with the "Progress: On Hold" label
+  #   b. it must remove the "Progress: review", "Progress: needs update","Progress: testing in progress", "Progress: extended testing" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - ['movedToColumn.name', 'eq', 'On Hold']
+      - [
+          ['projects#number', 'in', 17],
+          ['projects#number', 'in', 14]
+        ]
+    actions:
+      - addLabels: ['Progress: On Hold']
+      - removeLabels: ['Progress: review', 'Progress: needs update', 'Progress: testing in progress', 'Progress: extended testing' ]
+
+  # 12. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Ready for Testing" column:
+  #   a. it must be labeled with the "Progress: ready for testing" label
+  #   b. it must remove the "Progress: review" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - [
+          ['movedToColumn.name', 'eq', 'Ready for Testing'],
+          ['movedToColumn.name', 'eq', 'Reviewer Approved']
+        ]
+      - [
+          ['projects#number', 'in', 17],
+          ['projects#number', 'in', 24]
+        ]
+    actions:
+      - addLabels: ['Progress: ready for testing']
+      - removeLabels: ['Progress: review', 'Progress: needs update']
+
+  # 13. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Extended Testing" column:
+  #   a. it must be labeled with the "Progress: extended testing" label
+  #   b. it must remove the "Progress: testing in progress" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - ['movedToColumn.name', 'eq', 'Extended Testing (Optional)']
+      - ['projects#number', 'in', 17]
+    actions:
+      - addLabels: ['Progress: extended testing']
+      - removeLabels: ['Progress: testing in progress', 'Progress: pending approval']
+
+  # 14. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "To Approve" column:
+  #   a. it must be labeled with the "Progress: to approve" label
+  #   b. it must remove the "Progress: extended testing" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - ['movedToColumn.name', 'eq', 'To Approve']
+      - ['projects#number', 'in', 17]
+    actions:
+      - addLabels: ['Progress: to approve']
+      - removeLabels: ['Progress: extended testing']
+
+  # 15. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Pending Approval" column:
+  #   a. it must be labeled with the "Progress: pending approval" label
+  #   b. it must remove the "Progress: to approve" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - ['movedToColumn.name', 'eq', 'Pending Approval']
+      - ['projects#number', 'in', 17]
+    actions:
+      - addLabels: ['Progress: pending approval']
+      - removeLabels: ['Progress: to approve']
+
+  # 16. Whenever a pull request belongs to the "Community Dashboard" or "Pull Requests Dashboard" and is moved to the "Merge in Progress" column:
+  #   a. it must remove the "Progress: extended testing" label
+  - trigger: projects_v2_item.edited
+    conditions:
+      - [
+          ['movedToColumn.name', 'eq', 'Merge in Progress'],
+          ['movedToColumn.name', 'eq', 'Ready for Delivery']
+        ]
+      - [
+          ['projects#number', 'in', 17],
+          ['projects#number', 'in', 24]
+        ]
+    actions:
+      - removeLabels: ['Progress: extended testing']
+      - addLabels: ['Progress: accept']
+
+  # 17. Whenever a pull request is merged:
+  #   a. it must be moved to the "Recently Merged" column
+  - trigger: pull_request.closed
+    conditions:
+      - ['merged', 'eq', true]
+    actions:
+      - moveTo: [17, 'Recently Merged']
+      - moveTo: [24, 'Done']
+
+  # 18. Whenever a pull request is closed:
+  #   a. it must be removed from the "Pull Requests Dashboard" project
+  #   b. it must be removed from the "Community Dashboard" project
+  - trigger: pull_request.closed
+    conditions:
+      - ['merged', 'ne', true]
+    actions:
+      - removeFromProject: [24] #['Pull Requests Dashboard']
+      - removeFromProject: [17] #['Community Dashboard']
+
+
+  ############################################################################################################
+  # Automation Rules related to issues goes here                                                             #
+  ############################################################################################################
diff --git a/README.md b/README.md
index 095a53df26c..ddb64e534fa 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,8 @@ The wiki provides more information on the Page Builder project, such as:
 - [MFTF best practices](https://github.com/magento/magento2-page-builder-docs/wiki/%5BRough-Draft%5D-MFTF-Best-Practices)
 
 ## Documentation
-Complete documentation located on the [Magento DevDocs](https://devdocs.magento.com/page-builder/docs/), including what you need to know to start local development as described in the [installation guide](https://github.com/magento/magento2-page-builder-docs/wiki/Installation-Guide).
+
+Complete documentation located on the [Magento DevDocs](https://developer.adobe.com/commerce/frontend-core/page-builder/), including what you need to know to start local development as described in the [installation guide](https://github.com/magento/magento2-page-builder-docs/wiki/Installation-Guide).
 
 ## Community Engineering Slack
 
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml
index 774d7f78c65..d155042a976 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Suite/RemoteStorageAwsS3EnabledPageBuilderSuite.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="RemoteStorageAwsS3EnabledPageBuilderSuite">
@@ -18,7 +18,9 @@
             <magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
             <magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
             <magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage"/>
@@ -28,7 +30,9 @@
             </actionGroup>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <include>
             <group name="remote_storage_aws_s3_pagebuilder"/>
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml
index 22f2e80b931..8cc5c0c1416 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml
index 0abf2e802bf..23be7d25a8e 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml
index f4482c9cd47..9b6578cedad 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageAwsS3Test.xml
similarity index 92%
rename from app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml
rename to app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageAwsS3Test.xml
index ac8c91d3010..e5d1611847a 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageAwsS3Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
index 96beb382d19..624b783d2d3 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml
index 81928a3c2d0..92fe1a819ad 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
index f5c024408d5..59d05372d79 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml
index bd4574123c9..2600eccdef1 100644
--- a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-allowlist b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-allowlist
new file mode 100644
index 00000000000..ad778d4e9c5
--- /dev/null
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-allowlist
@@ -0,0 +1,8 @@
+ImageAddImageContentTypeToCMSPageTest
+ImageAddImageIntoPageBuilderStageTest
+ImageInvalidFileTypeValidationTest
+ImageRemoveImageFromStageTest
+PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory
+PageBuilderDeleteTemplate
+PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut
+CanAddVideoToColumnTest
diff --git a/app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-errors-detailed b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-errors-detailed
new file mode 100644
index 00000000000..a9e163dda47
--- /dev/null
+++ b/app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-errors-detailed
@@ -0,0 +1,40 @@
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageAddImageContentTypeToCMSPageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageAddImageIntoPageBuilderStageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageInvalidFileTypeValidationTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageRemoveImageFromStageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderDeleteTemplate from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut from module(s): magento/module-banner-page-builder, magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CanAddVideoToColumnTest from module(s): magento/module-page-builder
diff --git a/app/code/Magento/AwsS3PageBuilder/composer.json b/app/code/Magento/AwsS3PageBuilder/composer.json
index 35001c3990f..d1834302d66 100644
--- a/app/code/Magento/AwsS3PageBuilder/composer.json
+++ b/app/code/Magento/AwsS3PageBuilder/composer.json
@@ -3,7 +3,7 @@
     "description": "Aws S3 Page Builder module",
     "require": {
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "suggest": {
         "magento/module-page-builder": "*",
diff --git a/app/code/Magento/AwsS3PageBuilder/etc/module.xml b/app/code/Magento/AwsS3PageBuilder/etc/module.xml
index 14b9c2fd9cd..5044985c8cc 100644
--- a/app/code/Magento/AwsS3PageBuilder/etc/module.xml
+++ b/app/code/Magento/AwsS3PageBuilder/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
diff --git a/app/code/Magento/AwsS3PageBuilder/registration.php b/app/code/Magento/AwsS3PageBuilder/registration.php
index 1632be220c5..f0e4e7657c1 100644
--- a/app/code/Magento/AwsS3PageBuilder/registration.php
+++ b/app/code/Magento/AwsS3PageBuilder/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 use \Magento\Framework\Component\ComponentRegistrar;
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/README.md b/app/code/Magento/CatalogPageBuilderAnalytics/README.md
index ae30e7709c0..6619899ff41 100644
--- a/app/code/Magento/CatalogPageBuilderAnalytics/README.md
+++ b/app/code/Magento/CatalogPageBuilderAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_CatalogPageBuilderAnalytics module
 
-The Magento_CatalogPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html).
+The Magento_CatalogPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/).
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
index 427f3b47605..142d06af2a4 100644
--- a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
+++ b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json
@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-catalog": "*",
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/etc/analytics.xml b/app/code/Magento/CatalogPageBuilderAnalytics/etc/analytics.xml
index 484b23e8956..ac0a831335c 100644
--- a/app/code/Magento/CatalogPageBuilderAnalytics/etc/analytics.xml
+++ b/app/code/Magento/CatalogPageBuilderAnalytics/etc/analytics.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/etc/module.xml b/app/code/Magento/CatalogPageBuilderAnalytics/etc/module.xml
index 43e40054d59..08e21496e8a 100644
--- a/app/code/Magento/CatalogPageBuilderAnalytics/etc/module.xml
+++ b/app/code/Magento/CatalogPageBuilderAnalytics/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/etc/reports.xml b/app/code/Magento/CatalogPageBuilderAnalytics/etc/reports.xml
index 8079a655732..38e8df5016d 100644
--- a/app/code/Magento/CatalogPageBuilderAnalytics/etc/reports.xml
+++ b/app/code/Magento/CatalogPageBuilderAnalytics/etc/reports.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/registration.php b/app/code/Magento/CatalogPageBuilderAnalytics/registration.php
index d7abf1a5eea..e9f1f05f264 100644
--- a/app/code/Magento/CatalogPageBuilderAnalytics/registration.php
+++ b/app/code/Magento/CatalogPageBuilderAnalytics/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 use \Magento\Framework\Component\ComponentRegistrar;
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/README.md b/app/code/Magento/CmsPageBuilderAnalytics/README.md
index ded0c0af716..6e2bbb0552d 100644
--- a/app/code/Magento/CmsPageBuilderAnalytics/README.md
+++ b/app/code/Magento/CmsPageBuilderAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_CmsPageBuilderAnalytics module
 
-The Magento_CmsPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html).
+The Magento_CmsPageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/).
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
index 18b717cbbd2..e5c5167af89 100644
--- a/app/code/Magento/CmsPageBuilderAnalytics/composer.json
+++ b/app/code/Magento/CmsPageBuilderAnalytics/composer.json
@@ -8,7 +8,7 @@
         "magento/module-page-builder-analytics": "*",
         "magento/module-cms": "*",
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/etc/analytics.xml b/app/code/Magento/CmsPageBuilderAnalytics/etc/analytics.xml
index f6f8547bc95..dbee593d319 100644
--- a/app/code/Magento/CmsPageBuilderAnalytics/etc/analytics.xml
+++ b/app/code/Magento/CmsPageBuilderAnalytics/etc/analytics.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/analytics.xsd">
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/etc/module.xml b/app/code/Magento/CmsPageBuilderAnalytics/etc/module.xml
index 38bbc6f7bd6..4c8c37ee90c 100644
--- a/app/code/Magento/CmsPageBuilderAnalytics/etc/module.xml
+++ b/app/code/Magento/CmsPageBuilderAnalytics/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/etc/reports.xml b/app/code/Magento/CmsPageBuilderAnalytics/etc/reports.xml
index 8093658bde2..38f892f3b1f 100644
--- a/app/code/Magento/CmsPageBuilderAnalytics/etc/reports.xml
+++ b/app/code/Magento/CmsPageBuilderAnalytics/etc/reports.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/reports.xsd">
diff --git a/app/code/Magento/CmsPageBuilderAnalytics/registration.php b/app/code/Magento/CmsPageBuilderAnalytics/registration.php
index 2299d1b1b14..e8eb8d90a94 100644
--- a/app/code/Magento/CmsPageBuilderAnalytics/registration.php
+++ b/app/code/Magento/CmsPageBuilderAnalytics/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 use \Magento\Framework\Component\ComponentRegistrar;
diff --git a/app/code/Magento/PageBuilder/Api/Data/TemplateExtensionInterface.php b/app/code/Magento/PageBuilder/Api/Data/TemplateExtensionInterface.php
index ac01575c0f2..8dcde14ba4a 100644
--- a/app/code/Magento/PageBuilder/Api/Data/TemplateExtensionInterface.php
+++ b/app/code/Magento/PageBuilder/Api/Data/TemplateExtensionInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Api\Data;
diff --git a/app/code/Magento/PageBuilder/Api/Data/TemplateInterface.php b/app/code/Magento/PageBuilder/Api/Data/TemplateInterface.php
index 276f0142e87..6bb79bc577a 100644
--- a/app/code/Magento/PageBuilder/Api/Data/TemplateInterface.php
+++ b/app/code/Magento/PageBuilder/Api/Data/TemplateInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Api\Data;
@@ -15,19 +15,19 @@
  */
 interface TemplateInterface extends ExtensibleDataInterface
 {
-    const KEY_ID = 'template_id';
+    public const KEY_ID = 'template_id';
 
-    const KEY_NAME = 'name';
+    public const KEY_NAME = 'name';
 
-    const KEY_PREVIEW_IMAGE = 'preview_image';
+    public const KEY_PREVIEW_IMAGE = 'preview_image';
 
-    const KEY_TEMPLATE = 'template';
+    public const KEY_TEMPLATE = 'template';
 
-    const KEY_CREATED_FOR = 'created_for';
+    public const KEY_CREATED_FOR = 'created_for';
 
-    const KEY_CREATED_AT = 'created_at';
+    public const KEY_CREATED_AT = 'created_at';
 
-    const KEY_UPDATED_AT = 'updated_at';
+    public const KEY_UPDATED_AT = 'updated_at';
 
     /**
      * Get Template ID
diff --git a/app/code/Magento/PageBuilder/Api/Data/TemplateSearchResultsInterface.php b/app/code/Magento/PageBuilder/Api/Data/TemplateSearchResultsInterface.php
index f1761ad5f08..fd0aa286093 100644
--- a/app/code/Magento/PageBuilder/Api/Data/TemplateSearchResultsInterface.php
+++ b/app/code/Magento/PageBuilder/Api/Data/TemplateSearchResultsInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Api\Data;
diff --git a/app/code/Magento/PageBuilder/Api/TemplateRepositoryInterface.php b/app/code/Magento/PageBuilder/Api/TemplateRepositoryInterface.php
index 149ba94ccd7..42fa6ad8fd3 100644
--- a/app/code/Magento/PageBuilder/Api/TemplateRepositoryInterface.php
+++ b/app/code/Magento/PageBuilder/Api/TemplateRepositoryInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Api;
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CancelButton.php b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CancelButton.php
index 6bad5988a5e..baecd69e6e6 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CancelButton.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CancelButton.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -25,7 +25,7 @@ class CancelButton implements ButtonProviderInterface
     /**
      * Constructor
      *
-     * @param $targetName
+     * @param string $targetName
      */
     public function __construct(string $targetName)
     {
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CloseButton.php b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CloseButton.php
index 29cd4c3fa22..dbca01e2760 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CloseButton.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/CloseButton.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -24,7 +24,7 @@ class CloseButton implements ButtonProviderInterface
     /**
      * Constructor
      *
-     * @param $targetName
+     * @param string $targetName
      */
     public function __construct(string $targetName)
     {
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/SaveButton.php b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/SaveButton.php
index 7d24076ba73..eb01a5960eb 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/SaveButton.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/ContentType/Edit/SaveButton.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php
index 1a05d0bdbe4..2dddbb25411 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Form/Element/ProductConditions.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php
index bdbb4db193e..4fbd86d3f22 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Html/Head/BabelPolyfill.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php
index 3b4c89c8e62..93ed889699c 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -15,11 +15,6 @@
 use Magento\PageBuilder\Model\Stage\Config;
 use Magento\Framework\Serialize\Serializer\Json;
 
-/**
- * Class Render
- *
- * @api
- */
 class Render extends Template
 {
     /**
@@ -56,7 +51,7 @@ public function __construct(
         Config $config,
         Json $json,
         array $data = [],
-        Minification $minification = null
+        ?Minification $minification = null
     ) {
         parent::__construct($context, $data);
         $this->fileManager = $fileManager;
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/EnableField.php b/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/EnableField.php
index 5be2d25f623..216e4ebcef2 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/EnableField.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/EnableField.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -36,7 +36,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/Form/Field/GoogleMapsApiKey.php b/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/Form/Field/GoogleMapsApiKey.php
index c731a467cd0..a5198ba23c4 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/Form/Field/GoogleMapsApiKey.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/Form/Field/GoogleMapsApiKey.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/SwitchAttributeType.php b/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/SwitchAttributeType.php
index 506ac18b58d..925694f3e56 100644
--- a/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/SwitchAttributeType.php
+++ b/app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/SwitchAttributeType.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Block\Adminhtml\System\Config;
 
-use Magento\Backend\Block\Template\Context;
 use Magento\Config\Block\System\Config\Form\Field;
 use Magento\Framework\Phrase;
+use Magento\Backend\Block\Template\Context;
 
 /**
  * Class SwitchAttributeType renders modal window to confirm changing attribute type
@@ -22,6 +22,7 @@ class SwitchAttributeType extends Field
     /**
      * @param Context $context
      * @param array $data
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found
      */
     public function __construct(
         Context $context,
diff --git a/app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php b/app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php
index 91ccda524ce..4dc7f585ccc 100644
--- a/app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php
+++ b/app/code/Magento/PageBuilder/Block/Catalog/Block/Product/View/Attributes.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -14,9 +14,9 @@
  */
 class Attributes extends \Magento\Catalog\Block\Product\View\Attributes
 {
-    const DISPLAY_ATTRIBUTES_NON_PAGEBUILDER = 'non_pagebuilder';
+    public const DISPLAY_ATTRIBUTES_NON_PAGEBUILDER = 'non_pagebuilder';
 
-    const DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY = 'pagebuilder_only';
+    public const DISPLAY_ATTRIBUTES_PAGEBUILDER_ONLY = 'pagebuilder_only';
 
     /**
      * @inheritdoc
diff --git a/app/code/Magento/PageBuilder/Block/Element/Editor.php b/app/code/Magento/PageBuilder/Block/Element/Editor.php
index f32ce6896e3..831ae438448 100644
--- a/app/code/Magento/PageBuilder/Block/Element/Editor.php
+++ b/app/code/Magento/PageBuilder/Block/Element/Editor.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,7 +15,7 @@
 class Editor extends \Magento\Framework\Data\Form\Element\Editor
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getElementHtml()
     {
@@ -27,7 +27,7 @@ public function getElementHtml()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function isEnabled()
     {
@@ -48,7 +48,7 @@ protected function isStageEnabled() : bool
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getInlineJs($jsSetupObject, $forceLoad)
     {
diff --git a/app/code/Magento/PageBuilder/Block/GoogleMapsApi.php b/app/code/Magento/PageBuilder/Block/GoogleMapsApi.php
index 6e822034ac9..00d0685f0be 100644
--- a/app/code/Magento/PageBuilder/Block/GoogleMapsApi.php
+++ b/app/code/Magento/PageBuilder/Block/GoogleMapsApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -16,9 +16,9 @@
  */
 class GoogleMapsApi extends \Magento\Framework\View\Element\Template
 {
-    const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
-    const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3&key=%s';
-    const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
+    public const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
+    public const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3.56&key=%s';
+    public const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
 
     /**
      * Retrieve the Google Maps API key
diff --git a/app/code/Magento/PageBuilder/Block/WidgetInitializer.php b/app/code/Magento/PageBuilder/Block/WidgetInitializer.php
index 9a200728c13..f41738cf0fd 100644
--- a/app/code/Magento/PageBuilder/Block/WidgetInitializer.php
+++ b/app/code/Magento/PageBuilder/Block/WidgetInitializer.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Block/WysiwygSetup.php b/app/code/Magento/PageBuilder/Block/WysiwygSetup.php
index d30a0979c8e..a2bf1ed4e7e 100644
--- a/app/code/Magento/PageBuilder/Block/WysiwygSetup.php
+++ b/app/code/Magento/PageBuilder/Block/WysiwygSetup.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -49,7 +49,7 @@ public function __construct(
         Context $context,
         ConfigInterface $config,
         array $data = [],
-        FrontendInterface $cache = null,
+        ?FrontendInterface $cache = null,
         ?RandomKey $sessionRandomKey = null
     ) {
         $this->config = $config;
diff --git a/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php b/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php
index c60642407ee..9a8965c862f 100644
--- a/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php
+++ b/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -18,6 +18,7 @@
 use Magento\PageBuilder\Model\Config as PageBuilderConfig;
 use Magento\PageBuilder\Model\State as PageBuilderState;
 use Magento\PageBuilder\Model\Stage\Config as Config;
+use Magento\Framework\AuthorizationInterface;
 
 /**
  * Updates wysiwyg element with Page Builder specific config
@@ -26,11 +27,19 @@
  */
 class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
 {
+
+    private const ADMIN_RESOURCE = 'Magento_Backend::content';
+
     /**
      * @var Repository
      */
     private $assetRepo;
 
+    /**
+     * @var AuthorizationInterface
+     */
+    private $authorization;
+
     /**
      * WYSIWYG Constructor
      *
@@ -46,6 +55,7 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
      * @param PageBuilderConfig|null $pageBuilderConfig
      * @param bool $overrideSnapshot
      * @param Repository|null $assetRepo
+     * @param AuthorizationInterface|null $authorization
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -60,11 +70,13 @@ public function __construct(
         array $components = [],
         array $data = [],
         array $config = [],
-        PageBuilderConfig $pageBuilderConfig = null,
+        ?PageBuilderConfig $pageBuilderConfig = null,
         bool $overrideSnapshot = false,
-        Repository $assetRepo = null
+        ?Repository $assetRepo = null,
+        ?AuthorizationInterface $authorization = null
     ) {
         $this->assetRepo = $assetRepo ?: ObjectManager::getInstance()->get(Repository::class);
+        $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);
         $wysiwygConfigData = $config['wysiwygConfigData'] ?? [];
 
         // If a dataType is present we're dealing with an attribute
@@ -79,11 +91,11 @@ public function __construct(
                 $config['wysiwyg'] = true;
             }
         }
-
+        $isAllowed = $this->authorization->isAllowed(self::ADMIN_RESOURCE);
         $isEnablePageBuilder = isset($wysiwygConfigData['is_pagebuilder_enabled'])
             && !$wysiwygConfigData['is_pagebuilder_enabled']
             || false;
-        if (!$pageBuilderState->isPageBuilderInUse($isEnablePageBuilder)) {
+        if (!$pageBuilderState->isPageBuilderInUse($isEnablePageBuilder) && $isAllowed) {
             // This is not done using definition.xml due to https://github.com/magento/magento2/issues/5647
             $data['config']['component'] = 'Magento_PageBuilder/js/form/element/wysiwyg';
 
diff --git a/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php b/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php
index 0a16806b57b..877a4e4906c 100644
--- a/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php
+++ b/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Component\Form;
@@ -19,7 +19,7 @@
  */
 class HtmlCode extends \Magento\Ui\Component\Form\Field
 {
-    const HTML_ID_PLACEHOLDER = 'HTML_ID_PLACEHOLDER';
+    public const HTML_ID_PLACEHOLDER = 'HTML_ID_PLACEHOLDER';
 
     /**
      * @var BackendUrlInterface
@@ -63,7 +63,7 @@ public function __construct(
         BackendUrlInterface $backendUrl,
         Images $imagesHelper,
         VariableConfig $variableConfig,
-        OpenDialogUrl $openDialogUrl = null,
+        ?OpenDialogUrl $openDialogUrl = null,
         $currentTreePath = 'wysiwyg',
         $components = [],
         array $data = []
diff --git a/app/code/Magento/PageBuilder/Component/GoogleMapsApiKeyValidationContainer.php b/app/code/Magento/PageBuilder/Component/GoogleMapsApiKeyValidationContainer.php
index 5b8d57bb6d9..2aba965488a 100644
--- a/app/code/Magento/PageBuilder/Component/GoogleMapsApiKeyValidationContainer.php
+++ b/app/code/Magento/PageBuilder/Component/GoogleMapsApiKeyValidationContainer.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -20,7 +20,7 @@
  */
 class GoogleMapsApiKeyValidationContainer extends \Magento\Ui\Component\Container
 {
-    const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
+    public const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
 
     /**
      * @var UrlInterface
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php
index 58bdd41d2e5..d4e32986ac9 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Block/Metadata.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -10,12 +10,15 @@
 
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class Metadata extends \Magento\Backend\App\AbstractAction
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
-    const ADMIN_RESOURCE = 'Magento_Cms::block';
+    public const ADMIN_RESOURCE = 'Magento_Cms::block';
 
     /**
      * @var \Magento\Cms\Model\ResourceModel\Block\CollectionFactory
@@ -36,6 +39,9 @@ public function __construct(
         $this->blockCollectionFactory = $blockCollectionFactory;
     }
 
+    /**
+     * @inheritDoc
+     */
     public function execute()
     {
         $params = $this->getRequest()->getParams();
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php
index e444769ac15..0540e17407b 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\PageBuilder\Controller\Adminhtml\ContentType\Image;
 
@@ -17,9 +17,9 @@
  */
 class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
-    const UPLOAD_DIR = 'wysiwyg';
+    public const UPLOAD_DIR = 'wysiwyg';
 
-    const ADMIN_RESOURCE = 'Magento_Backend::content';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content';
 
     /**
      * @var \Magento\Framework\Filesystem\DirectoryList
@@ -71,7 +71,7 @@ public function __construct(
         \Magento\Framework\File\UploaderFactory $uploaderFactory,
         \Magento\Framework\Filesystem\DirectoryList $directoryList,
         \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages,
-        Filesystem $filesystem = null
+        ?Filesystem $filesystem = null
     ) {
         parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions.php
index 3df0d7b6851..9690ec2848c 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -12,6 +12,7 @@
 
 /**
  * Responsible for rendering the top-level conditions rule tree using the provided params
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class ProductConditions extends \Magento\CatalogWidget\Controller\Adminhtml\Product\Widget
 {
@@ -41,7 +42,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritDoc
      */
     public function execute()
     {
@@ -58,7 +59,7 @@ public function execute()
         // The Combine class doesn't need the data attribute on children but we do.
         $this->configureConditionsFormName($conditions, $formName);
         $result = $conditions->asHtmlRecursive();
-        $this->getResponse()->setBody($result);
+        return $this->getResponse()->setBody($result);
     }
 
     /**
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/Child.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/Child.php
index c21ab2dfed8..3bbfc00aeb1 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/Child.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/Child.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php
index 6fbda8a79ef..74dfa318fc1 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductTotals.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/GoogleMaps/ValidateApi.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/GoogleMaps/ValidateApi.php
index 13f46447694..eca9b1ef99f 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/GoogleMaps/ValidateApi.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/GoogleMaps/ValidateApi.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -9,12 +9,9 @@
 
 use Magento\Framework\Controller\ResultFactory;
 
-/**
- * Class ValidateApi
- */
 class ValidateApi extends \Magento\Backend\App\Action implements \Magento\Framework\App\Action\HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_Backend::content';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content';
 
     /**
      * @var \Magento\PageBuilder\Model\GoogleMaps\ApiKeyValidator
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php
index 715ef598581..35b19bef34d 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Preview.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -16,7 +16,7 @@
  */
 class Preview extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_Backend::content';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content';
 
     /**
      * @var \Magento\PageBuilder\Model\Stage\RendererPool
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Render.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Render.php
index a9d5028050d..975621ca89f 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Render.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Stage/Render.php
@@ -1,8 +1,7 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Controller\Adminhtml\Stage;
@@ -18,7 +17,7 @@
  */
 class Render extends \Magento\Backend\App\Action implements HttpGetActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_Backend::content';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content';
 
     /**
      * @var \Magento\Framework\View\Result\PageFactory
@@ -36,7 +35,8 @@ public function __construct(
         PageFactory $pageFactory
     ) {
         $this->pageFactory = $pageFactory;
-        return parent::__construct($context);
+
+        parent::__construct($context);
     }
 
     /**
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Delete.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Delete.php
index 992fa4caa6c..ab7d25afda1 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Delete.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Delete.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -22,7 +22,7 @@
  */
 class Delete extends Action implements HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_PageBuilder::template_delete';
+    public const ADMIN_RESOURCE = 'Magento_PageBuilder::template_delete';
 
     /**
      * @var LoggerInterface
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Index.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Index.php
index d924bacb00a..b6f78e4878a 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Index.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Index.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -20,7 +20,7 @@
  */
 class Index extends Action implements HttpGetActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_PageBuilder::templates';
+    public const ADMIN_RESOURCE = 'Magento_PageBuilder::templates';
 
     /**
      * @var PageFactory
diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Save.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Save.php
index 516ac89e1ed..3f7f17af375 100644
--- a/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Save.php
+++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/Template/Save.php
@@ -1,13 +1,20 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Controller\Adminhtml\Template;
 
+use function preg_replace;
+use function str_replace;
+use function strpos;
+use function strtolower;
+use function substr;
+use function uniqid;
+use Exception;
 use Magento\Backend\App\Action;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\Api\ImageContent;
@@ -15,16 +22,19 @@
 use Magento\Framework\Api\ImageContentValidator;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Image\AdapterFactory;
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\PageBuilder\Api\Data\TemplateInterface;
 use Magento\PageBuilder\Api\TemplateRepositoryInterface;
 use Magento\PageBuilder\Model\TemplateFactory;
 use Psr\Log\LoggerInterface;
-use Magento\Framework\Image\AdapterFactory;
 
 /**
  * Save a template within template manager
@@ -33,7 +43,7 @@
  */
 class Save extends Action implements HttpPostActionInterface
 {
-    const ADMIN_RESOURCE = 'Magento_PageBuilder::template_save';
+    public const ADMIN_RESOURCE = 'Magento_PageBuilder::template_save';
 
     /**
      * @var LoggerInterface
@@ -151,7 +161,7 @@ public function execute()
                 $filePath = $this->storePreviewImage($request);
                 // Store the preview image within the new entity
                 $template->setPreviewImage($filePath);
-            } catch (\Exception $e) {
+            } catch (Exception $e) {
                 $this->logger->critical($e);
 
                 return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData(
@@ -176,7 +186,7 @@ public function execute()
                 'status' => 'error',
                 'message' => $e->getMessage()
             ];
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->logger->critical($e);
 
             $result = [
@@ -215,26 +225,28 @@ private function validate(RequestInterface $request)
      * Handle storing the preview image
      *
      * @param RequestInterface $request
-     * @return string
+     * @return null|string
+     * @throws Exception
+     * @throws FileSystemException
+     * @throws InputException
      * @throws LocalizedException
-     * @throws \Magento\Framework\Exception\FileSystemException
-     * @throws \Magento\Framework\Exception\InputException
      */
-    private function storePreviewImage(RequestInterface $request) : ?string
+    private function storePreviewImage(RequestInterface $request): ?string
     {
         $fileName = preg_replace("/[^A-Za-z0-9]/", '', str_replace(
-                ' ',
-                '-',
-                strtolower($request->getParam(TemplateInterface::KEY_NAME))
-            )) . uniqid() . '.jpg';
+            ' ',
+            '-',
+            strtolower($request->getParam(TemplateInterface::KEY_NAME))
+        )) . uniqid() . '.jpg';
 
         // Prepare the image data
         $imgData = str_replace(' ', '+', $request->getParam('previewImage'));
-        $imgData = substr($imgData, strpos($imgData, ",") + 1);
-        // phpcs:ignore
+        $imgData = substr($imgData, strpos($imgData, ',') + 1);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $decodedImage = base64_decode($imgData);
 
         $imageProperties = getimagesizefromstring($decodedImage);
+
         if (!$imageProperties) {
             throw new LocalizedException(__('Unable to get properties from image.'));
         }
@@ -246,16 +258,16 @@ private function storePreviewImage(RequestInterface $request) : ?string
         $imageContent->setType($imageProperties['mime']);
 
         if ($this->imageContentValidator->isValid($imageContent)) {
-            $mediaDirWrite = $this->filesystem
-                ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
+            $mediaDirWrite = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
             $directory = $mediaDirWrite->getAbsolutePath('.template-manager');
             $mediaDirWrite->create($directory);
-            $fileAbsolutePath = $directory . $fileName;
+
+            $fileAbsolutePath = $directory . DIRECTORY_SEPARATOR . $fileName;
             // Write the file to the directory
             $mediaDirWrite->getDriver()->filePutContents($fileAbsolutePath, $decodedImage);
             // Generate a thumbnail, called -thumb next to the image for usage in the grid
             $thumbPath = str_replace('.jpg', '-thumb.jpg', $fileName);
-            $thumbAbsolutePath = $directory . $thumbPath;
+            $thumbAbsolutePath = $directory . DIRECTORY_SEPARATOR . $thumbPath;
             $imageFactory = $this->imageAdapterFactory->create();
             $imageFactory->open($fileAbsolutePath);
             $imageFactory->resize(350);
diff --git a/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php b/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php
index 2ab6363b36b..c7dafa78461 100644
--- a/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php
+++ b/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -20,6 +20,7 @@
  * @deprecated use \Magento\PageBuilder\Controller\Adminhtml\Stage\Preview
  *
  * @api
+ * @see MC-16152
  */
 class Preview extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
@@ -43,7 +44,7 @@ class Preview extends \Magento\Framework\App\Action\Action implements HttpPostAc
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool,
-        \Magento\Backend\Model\Auth $auth = null
+        ?\Magento\Backend\Model\Auth $auth = null
     ) {
         parent::__construct($context);
 
@@ -70,7 +71,7 @@ public function execute()
 
             return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
         }
-
+        // @phpstan-ignore-next-line
         $this->_forward('noroute');
     }
 }
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php b/app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php
index ca7a73b72c7..d29c2da2120 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -14,6 +14,9 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogWidget\Model\Rule;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Rule\Model\Condition\Combine;
@@ -53,25 +56,41 @@ class ProductTotals
      */
     private $categoryRepository;
 
+    /**
+     * @var MetadataPool
+     */
+    private MetadataPool $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private ResourceConnection $resource;
+
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param Builder $sqlBuilder
      * @param Rule $rule
      * @param Conditions $conditionsHelper
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param MetadataPool|null $metadataPool
+     * @param ResourceConnection|null $resource
      */
     public function __construct(
         CollectionFactory $productCollectionFactory,
         Builder $sqlBuilder,
         Rule $rule,
         Conditions $conditionsHelper,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ?MetadataPool $metadataPool = null,
+        ?ResourceConnection $resource = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->sqlBuilder = $sqlBuilder;
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->categoryRepository = $categoryRepository;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->resource = $resource ?: ObjectManager::getInstance()->get(ResourceConnection::class);
     }
 
     /**
@@ -159,17 +178,57 @@ private function getProductCollection(string $conditions, bool $usePriceIndex =
         return $collection;
     }
 
+    /**
+     * Get parent products that don't have stand-alone properties (e.g. price or special price)
+     *
+     * @param Collection $collection
+     * @return Collection|null
+     * @throws \Exception
+     */
+    private function getParentProductsCollection(Collection $collection): ?Collection
+    {
+        $parentProducts = $this->productCollectionFactory->create();
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
+        $connection = $this->resource->getConnection();
+        $productIds = $connection->fetchCol(
+            $connection
+                ->select()
+                ->from(['e' => $collection->getTable('catalog_product_entity')], ['link_table.parent_id'])
+                ->joinInner(
+                    ['link_table' => $collection->getTable('catalog_product_super_link')],
+                    'link_table.product_id = e.' . $linkField,
+                    []
+                )
+                ->where('link_table.product_id IN (?)', $collection->getAllIds())
+        );
+        if ($productIds) {
+            $parentProducts->addIdFilter($productIds);
+            return $parentProducts;
+        }
+
+        return null;
+    }
+
     /**
      * Retrieve count of all enabled products
      *
      * @param string $conditions
      * @return int number of enabled products
+     * @throws LocalizedException
+     * @throws \Exception
      */
     private function getEnabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, true);
         $collection->addAttributeToFilter('status', Status::STATUS_ENABLED);
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($collection->getSize() && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
@@ -177,12 +236,19 @@ private function getEnabledCount(string $conditions): int
      *
      * @param string $conditions
      * @return int number of disabled products
+     * @throws \Exception
      */
     private function getDisabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, false);
         $collection->addAttributeToFilter('status', Status::STATUS_DISABLED);
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_DISABLED);
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
@@ -190,6 +256,7 @@ private function getDisabledCount(string $conditions): int
      *
      * @param string $conditions
      * @return int number of products not visible individually
+     * @throws \Exception
      */
     private function getNotVisibleCount(string $conditions): int
     {
@@ -202,7 +269,20 @@ private function getNotVisibleCount(string $conditions): int
                 Visibility::VISIBILITY_IN_SEARCH
             ]
         );
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $parentProducts->addAttributeToFilter(
+                'visibility',
+                [
+                    Visibility::VISIBILITY_NOT_VISIBLE,
+                    Visibility::VISIBILITY_IN_SEARCH
+                ]
+            );
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting.php
index 7e3fb6086ce..1ee6fc5b019 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Category/Position.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Category/Position.php
index 490ded49630..8e3d8ca7c9d 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Category/Position.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Category/Position.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Factory.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Factory.php
index 842b76103f3..8e9a94c51e0 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Factory.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Factory.php
@@ -1,16 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Catalog\Sorting;
 
-/**
- * Class Factory
- */
 class Factory
 {
     /**
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/OptionInterface.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/OptionInterface.php
index f4abe0b2d0d..a27f1e82e19 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/OptionInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/OptionInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Options.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Options.php
index de738620fe6..0bcbf32272a 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Options.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Options.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price.php
index 7f90e71329a..00d0c9999de 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php
index 7d93c877d40..359a73b8371 100644
--- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php
+++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -43,9 +43,9 @@ class SimpleOption implements OptionInterface
      */
     public function __construct(
         string $label,
-        string $sortDirection = null,
-        string $attributeField = null,
-        string $secondarySortDirection = null
+        ?string $sortDirection = null,
+        ?string $attributeField = null,
+        ?string $secondarySortDirection = null
     ) {
         $this->label = $label;
         $this->sortDirection = $sortDirection;
diff --git a/app/code/Magento/PageBuilder/Model/Config.php b/app/code/Magento/PageBuilder/Model/Config.php
index ca02fbea46f..a209ab8bb0f 100644
--- a/app/code/Magento/PageBuilder/Model/Config.php
+++ b/app/code/Magento/PageBuilder/Model/Config.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -15,7 +15,7 @@
  */
 class Config extends \Magento\Framework\Config\Data implements \Magento\PageBuilder\Model\ConfigInterface
 {
-    const IS_PAGEBUILDER_ENABLED = 'cms/pagebuilder/enabled';
+    public const IS_PAGEBUILDER_ENABLED = 'cms/pagebuilder/enabled';
 
     private const IS_PAGEBUILDER_CONTENT_PREVIEW_ENABLED = 'cms/pagebuilder/enable_content_preview';
 
diff --git a/app/code/Magento/PageBuilder/Model/Config/CompositeReader.php b/app/code/Magento/PageBuilder/Model/Config/CompositeReader.php
index cde39529605..51129396be9 100644
--- a/app/code/Magento/PageBuilder/Model/Config/CompositeReader.php
+++ b/app/code/Magento/PageBuilder/Model/Config/CompositeReader.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php
index 7c4a632763c..98591446793 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/BlockDataUrl.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/BlockDataUrl.php
index 5ef9000d1dc..f460a111f50 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/BlockDataUrl.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/BlockDataUrl.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/StoreId.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/StoreId.php
index 3d66ae3d418..f114eed964d 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/StoreId.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/StoreId.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php
index 1b9988ce7b8..3865d25c9a7 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/MaxFileSize.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/OpenDialogUrl.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/OpenDialogUrl.php
index e72f060a586..b7fb9707c24 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/OpenDialogUrl.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/OpenDialogUrl.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/SaveUrl.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/SaveUrl.php
index 918c1305b02..2a0196faa18 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/SaveUrl.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Uploader/SaveUrl.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Wysiwyg/Config.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Wysiwyg/Config.php
index fcdc2310e71..702cadcd60b 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Wysiwyg/Config.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Provider/Wysiwyg/Config.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/ProviderInterface.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/ProviderInterface.php
index b05e2b988c0..fe025d4cf50 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/ProviderInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/ProviderInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -17,6 +17,7 @@ interface ProviderInterface
 {
     /**
      * Get data from the provider
+     *
      * @param string $itemName - the name of the item to use as key in returned array
      * @return array
      */
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php
index 4c2dcbe56b2..79bda6c97ac 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -15,8 +15,8 @@
  */
 class Converter implements \Magento\Framework\Config\ConverterInterface
 {
-    const DEFAULT_ATTRIBUTE_READER = 'Magento_PageBuilder/js/property/attribute-reader';
-    const DEFAULT_PROPERTY_READER = 'Magento_PageBuilder/js/property/style-property-reader';
+    public const DEFAULT_ATTRIBUTE_READER = 'Magento_PageBuilder/js/property/attribute-reader';
+    public const DEFAULT_PROPERTY_READER = 'Magento_PageBuilder/js/property/style-property-reader';
 
     /**
      * @var ArgumentParser
@@ -25,6 +25,7 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
 
     /**
      * Converter constructor.
+     *
      * @param ArgumentParser $parser
      */
     public function __construct(
@@ -529,6 +530,7 @@ private function convertParentsToAllowedParents(
         array $types,
         array $allowedParentsData
     ): array {
+        $baseAllowedTypes = $types;
         foreach ($parentChildData as $key => $value) {
             $parent = $value['parents'] ?? [];
 
@@ -542,7 +544,7 @@ private function convertParentsToAllowedParents(
             if ($parent['defaultPolicy'] === 'deny') {
                 $allowedParents = $allowedTypes;
             } else {
-                $allowedParents = array_merge($types, $allowedTypes);
+                $allowedParents = [...$baseAllowedTypes, ...$allowedTypes];
                 foreach ($deniedTypes as $type) {
                     $allowedParents = $this->removeDataInArray($type, $allowedParents);
                 }
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/Reader.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/Reader.php
index 4a74ba40a54..763ddebfe99 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/Reader.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/Reader.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -10,8 +10,8 @@
 
 class Reader extends \Magento\Framework\Config\Reader\Filesystem
 {
-    const TYPE_PATH = '/config/type';
-    
+    public const TYPE_PATH = '/config/type';
+
     /**
      * List of id attributes for merge
      *
@@ -50,6 +50,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\FileResolver $fileResolver,
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/SchemaLocator.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/SchemaLocator.php
index 0f34b0a6e0a..08619be6221 100644
--- a/app/code/Magento/PageBuilder/Model/Config/ContentType/SchemaLocator.php
+++ b/app/code/Magento/PageBuilder/Model/Config/ContentType/SchemaLocator.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/FileResolver.php b/app/code/Magento/PageBuilder/Model/Config/FileResolver.php
index bff9557e789..15b7b496ec4 100755
--- a/app/code/Magento/PageBuilder/Model/Config/FileResolver.php
+++ b/app/code/Magento/PageBuilder/Model/Config/FileResolver.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -45,7 +45,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function get($filename, $scope): array
     {
@@ -54,7 +54,9 @@ public function get($filename, $scope): array
         $files = $this->baseFiles->getFiles($this->design->getDesignTheme(), $filename);
         foreach ($files as $file) {
             $fullFileName = $file->getFileName();
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $fileDir = dirname($fullFileName);
+            // phpcs:ignore Magento2.Functions.DiscouragedFunction
             $fileName = basename($fullFileName);
             $dirRead = $this->readFactory->create($fileDir);
             $result[$fullFileName] = $dirRead->readFile($fileName);
diff --git a/app/code/Magento/PageBuilder/Model/Config/MenuSection/Converter.php b/app/code/Magento/PageBuilder/Model/Config/MenuSection/Converter.php
index bbc7eecb37a..eb83d010d10 100644
--- a/app/code/Magento/PageBuilder/Model/Config/MenuSection/Converter.php
+++ b/app/code/Magento/PageBuilder/Model/Config/MenuSection/Converter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/MenuSection/Reader.php b/app/code/Magento/PageBuilder/Model/Config/MenuSection/Reader.php
index 4ebea737ca3..c03f9a923e3 100644
--- a/app/code/Magento/PageBuilder/Model/Config/MenuSection/Reader.php
+++ b/app/code/Magento/PageBuilder/Model/Config/MenuSection/Reader.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -33,6 +33,7 @@ class Reader extends \Magento\Framework\Config\Reader\Filesystem
      * @param array $idAttributes
      * @param string $domDocumentClass
      * @param string $defaultScope
+     * phpcs:disable Generic.CodeAnalysis.UselessOverridingMethod.Found
      */
     public function __construct(
         \Magento\PageBuilder\Model\Config\FileResolver $fileResolver,
diff --git a/app/code/Magento/PageBuilder/Model/Config/MenuSection/SchemaLocator.php b/app/code/Magento/PageBuilder/Model/Config/MenuSection/SchemaLocator.php
index f2d1df58036..3b757dc4c4c 100644
--- a/app/code/Magento/PageBuilder/Model/Config/MenuSection/SchemaLocator.php
+++ b/app/code/Magento/PageBuilder/Model/Config/MenuSection/SchemaLocator.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Config/Source/Country.php b/app/code/Magento/PageBuilder/Model/Config/Source/Country.php
index 6738636f599..e1bbfae8ece 100644
--- a/app/code/Magento/PageBuilder/Model/Config/Source/Country.php
+++ b/app/code/Magento/PageBuilder/Model/Config/Source/Country.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/ConfigInterface.php b/app/code/Magento/PageBuilder/Model/ConfigInterface.php
index 310803cdb16..23d90a4eece 100644
--- a/app/code/Magento/PageBuilder/Model/ConfigInterface.php
+++ b/app/code/Magento/PageBuilder/Model/ConfigInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/ContentType/DataProvider.php b/app/code/Magento/PageBuilder/Model/ContentType/DataProvider.php
index ad110530146..198b0ee6baa 100644
--- a/app/code/Magento/PageBuilder/Model/ContentType/DataProvider.php
+++ b/app/code/Magento/PageBuilder/Model/ContentType/DataProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/AttrInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/AttrInterface.php
index 07be2c1bc3e..a1757f52d6e 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/AttrInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/AttrInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/CharacterDataInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/CharacterDataInterface.php
index edd11f91f1a..34c6e010d3a 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/CharacterDataInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/CharacterDataInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/CommentInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/CommentInterface.php
index 2da0ad76f63..74c625f1d56 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/CommentInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/CommentInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentFragmentInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentFragmentInterface.php
index 6bad9cedcba..7792600cf62 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentFragmentInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentFragmentInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php
index 8445ca7d424..26d83a1d6e2 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -38,7 +38,7 @@ public function createDocumentFragment(): DocumentFragmentInterface;
      * @param string $value [optional]
      * @return ElementInterface
      */
-    public function createElement(string $name, string $value = null);
+    public function createElement(string $name, ?string $value = null);
 
     /**
      * Returns the first element matching the specified selector.
@@ -62,7 +62,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface;
      * @param DOMNode|null $node
      * @return string
      */
-    public function saveHTML(DOMNode $node = null): string;
+    public function saveHTML(?DOMNode $node = null): string;
 
     /**
      * Closes the stream and any underlying resources.
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentTypeInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentTypeInterface.php
index 9690486ac32..599e9b72bdb 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentTypeInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentTypeInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php
index 5f2152c9915..49ed664d6b5 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlCollectionInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlCollectionInterface.php
index 90fbbe36e13..d50bdbbada1 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlCollectionInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlCollectionInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlDocumentInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlDocumentInterface.php
index 0f799a7820e..3d7b5c6a40e 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlDocumentInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlDocumentInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeInterface.php
index 76685099af5..328d657a2dd 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeListInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeListInterface.php
index 65b47e770fa..98b974e14ad 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeListInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeListInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/PropertyAttributeInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/PropertyAttributeInterface.php
index f91677445f7..c2488680147 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/PropertyAttributeInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/PropertyAttributeInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/StringMapInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/StringMapInterface.php
index e01cd731596..63c6fe177df 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/StringMapInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/StringMapInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/TextInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/TextInterface.php
index 3f4c94e5b68..7035a9282a3 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/TextInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/TextInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/TokenListInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/TokenListInterface.php
index 09ee84977e1..485d86a2ebd 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/TokenListInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/TokenListInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/XmlDocumentInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/XmlDocumentInterface.php
index 94b9d63c368..1b40c787a8b 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/XmlDocumentInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/XmlDocumentInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Attr.php b/app/code/Magento/PageBuilder/Model/Dom/Attr.php
index 88f80bad90f..ba3cda82de9 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Attr.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Attr.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/CharacterData.php b/app/code/Magento/PageBuilder/Model/Dom/CharacterData.php
index 53adc5ab6a2..de90f3efd9d 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/CharacterData.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/CharacterData.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Comment.php b/app/code/Magento/PageBuilder/Model/Dom/Comment.php
index 59dccaf31d7..7c61713f0c6 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Comment.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Comment.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Document.php b/app/code/Magento/PageBuilder/Model/Dom/Document.php
index 58d65530393..0555a2d97b1 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Document.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Document.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Dom;
 
 use DOMNode;
-use Gt\Dom\Document as GtDomDocument;
+use Magento\PageBuilder\Model\Dom\DomDocument;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\DocumentFragmentInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\DocumentInterface;
@@ -26,21 +26,29 @@ class Document implements DocumentInterface
     protected $objectManager;
 
     /**
-     * @var GtDomDocument
+     * @var DOMDocument
      */
     protected $document;
 
     /**
      * Document constructor.
      * @param ObjectManagerInterface $objectManager
-     * @param string $document
+     * @param string $characterSet
+     * @param string $contentType
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $document = ""
+        string $characterSet,
+        string $contentType
     ) {
         $this->objectManager = $objectManager;
-        $this->document = $this->objectManager->create(GtDomDocument::class, [ 'document' => $document ]);
+        $this->document = $this->objectManager->create(
+            DomDocument::class,
+            [
+                'characterSet' => $characterSet,
+                'contentType' => $contentType
+            ]
+        );
     }
 
     /**
@@ -65,7 +73,7 @@ public function createDocumentFragment(): DocumentFragmentInterface
     /**
      * @inheritDoc
      */
-    public function createElement(string $name, string $value = null): ElementInterface
+    public function createElement(string $name, ?string $value = null): ElementInterface
     {
         return $this->objectManager->create(
             ElementInterface::class,
@@ -98,7 +106,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface
     /**
      * @inheritDoc
      */
-    public function saveHTML(DOMNode $node = null): string
+    public function saveHTML(?DOMNode $node = null): string
     {
         return $this->document->saveHTML($node);
     }
diff --git a/app/code/Magento/PageBuilder/Model/Dom/DocumentFragment.php b/app/code/Magento/PageBuilder/Model/Dom/DocumentFragment.php
index 1188b2829a5..be423ec2fdd 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/DocumentFragment.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/DocumentFragment.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/DocumentType.php b/app/code/Magento/PageBuilder/Model/Dom/DocumentType.php
index 74238e80510..6a38807916f 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/DocumentType.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/DocumentType.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/DomDocument.php b/app/code/Magento/PageBuilder/Model/Dom/DomDocument.php
new file mode 100644
index 00000000000..6c660d0036a
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Model/Dom/DomDocument.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Dom;
+
+use Gt\Dom\Document as GtDomDocument;
+
+/**
+ * PhpGt DOM Document wrapper.
+ */
+class DomDocument extends GtDomDocument
+{
+}
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Element.php b/app/code/Magento/PageBuilder/Model/Dom/Element.php
index 352d315bbc8..a17370e4f81 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Element.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Element.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -145,7 +145,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface
     public function removeStyle(string $styleProperty): string
     {
         $style = $this->getAttribute('style');
-        $this->setAttribute('style', preg_replace("/${styleProperty}:(.*?);/", '', $style ?? ''));
+        $this->setAttribute('style', preg_replace("/{$styleProperty}:(.*?);/", '', $style ?? ''));
         return $this->getAttribute('style') ?? '';
     }
 
@@ -155,7 +155,7 @@ public function removeStyle(string $styleProperty): string
     public function addStyle(string $styleProperty, string $value): string
     {
         $this->removeStyle($styleProperty);
-        $this->setAttribute('style', "${styleProperty}: $value; " . $this->getAttribute('style') ?? '');
+        $this->setAttribute('style', "{$styleProperty}: $value; " . $this->getAttribute('style') ?? '');
         return $this->getAttribute('style') ?? '';
     }
 }
diff --git a/app/code/Magento/PageBuilder/Model/Dom/HtmlCollection.php b/app/code/Magento/PageBuilder/Model/Dom/HtmlCollection.php
index acdab9f4e84..1f9bf89fc4b 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/HtmlCollection.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/HtmlCollection.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -9,7 +9,7 @@
 
 use ArrayAccess;
 use Countable;
-use Gt\Dom\HTMLCollection as GtDomHTMLCollection;
+use Gt\Dom\NodeList as GtDomNodeList;
 use Iterator;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\ElementInterface;
@@ -26,7 +26,7 @@ class HtmlCollection implements Iterator, ArrayAccess, Countable, HtmlCollection
     private $objectManager;
 
     /**
-     * @var GtDomHTMLCollection
+     * @var GtDomNodeList
      */
     private $collection;
 
@@ -34,11 +34,11 @@ class HtmlCollection implements Iterator, ArrayAccess, Countable, HtmlCollection
      * HtmlCollection constructor.
      *
      * @param ObjectManagerInterface $objectManager
-     * @param GtDomHTMLCollection $collection
+     * @param GtDomNodeList $collection
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        GtDomHTMLCollection $collection
+        GtDomNodeList $collection
     ) {
         $this->objectManager = $objectManager;
         $this->collection = $collection;
diff --git a/app/code/Magento/PageBuilder/Model/Dom/HtmlDocument.php b/app/code/Magento/PageBuilder/Model/Dom/HtmlDocument.php
index 0a840c6ff7e..40eda026397 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/HtmlDocument.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/HtmlDocument.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,13 +21,23 @@ class HtmlDocument extends Document implements HtmlDocumentInterface
      * HtmlDocument constructor.
      * @param ObjectManagerInterface $objectManager
      * @param string $document
+     * @param string $characterSet
+     * @param string $contentType
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $document = ""
+        string $document,
+        string $characterSet = "UTF-8",
+        string $contentType = "text/html"
     ) {
-        parent::__construct($objectManager, $document);
-        $this->document = $this->objectManager->create(GtDomHTMLDocument::class, [ 'document' => $document ]);
+        parent::__construct($objectManager, $characterSet, $contentType);
+        $this->document = $this->objectManager->create(
+            GtDomHTMLDocument::class,
+            [
+                "html" => $document,
+                "characterSet" => $characterSet
+            ]
+        );
     }
 
     /**
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Node.php b/app/code/Magento/PageBuilder/Model/Dom/Node.php
index 13869489af6..4317f2fcea5 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Node.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Node.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/NodeList.php b/app/code/Magento/PageBuilder/Model/Dom/NodeList.php
index 5f512dc3aaa..a4cc1c484aa 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/NodeList.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/NodeList.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/PropertyAttribute.php b/app/code/Magento/PageBuilder/Model/Dom/PropertyAttribute.php
index e8d1853658c..7bfaf615133 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/PropertyAttribute.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/PropertyAttribute.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/StringMap.php b/app/code/Magento/PageBuilder/Model/Dom/StringMap.php
index fd5690395ee..d09839aa9cb 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/StringMap.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/StringMap.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Dom;
 
-use Gt\Dom\StringMap as GtDomStringMap;
+use Gt\Dom\DOMStringMap as GtDomStringMap;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\StringMapInterface;
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/Text.php b/app/code/Magento/PageBuilder/Model/Dom/Text.php
index 19115bd2674..3381c99d5dd 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/Text.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/Text.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/TokenList.php b/app/code/Magento/PageBuilder/Model/Dom/TokenList.php
index b4fa5f3f184..2284f72b958 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/TokenList.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/TokenList.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Dom;
 
-use Gt\Dom\TokenList as GtDomTokenList;
+use Gt\Dom\DOMTokenList as GtDomTokenList;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\PageBuilder\Model\Dom\Adapter\TokenListInterface;
 
diff --git a/app/code/Magento/PageBuilder/Model/Dom/XmlDocument.php b/app/code/Magento/PageBuilder/Model/Dom/XmlDocument.php
index 0cdb9644672..e084cf130d5 100644
--- a/app/code/Magento/PageBuilder/Model/Dom/XmlDocument.php
+++ b/app/code/Magento/PageBuilder/Model/Dom/XmlDocument.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -21,12 +21,22 @@ class XmlDocument extends Document implements XmlDocumentInterface
      *
      * @param ObjectManagerInterface $objectManager
      * @param string $document
+     * @param string $characterSet
+     * @param string $contentType
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $document = ""
+        string $document = "",
+        string $characterSet = "UTF-8",
+        string $contentType = "text/html"
     ) {
-        parent::__construct($objectManager, $document);
-        $this->document = $this->objectManager->create(GtDomXmlDocument::class, [ 'document' => $document ]);
+        parent::__construct($objectManager, $characterSet, $contentType);
+        $this->document = $this->objectManager->create(
+            GtDomXmlDocument::class,
+            [
+                "document" => $document,
+                "characterSet" => $characterSet
+            ]
+        );
     }
 }
diff --git a/app/code/Magento/PageBuilder/Model/EditorConfigCacheCleaner.php b/app/code/Magento/PageBuilder/Model/EditorConfigCacheCleaner.php
index da8bbcc9262..418f34b1c86 100644
--- a/app/code/Magento/PageBuilder/Model/EditorConfigCacheCleaner.php
+++ b/app/code/Magento/PageBuilder/Model/EditorConfigCacheCleaner.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Filter/Template.php b/app/code/Magento/PageBuilder/Model/Filter/Template.php
index 52c9f81ade5..f0447f03557 100644
--- a/app/code/Magento/PageBuilder/Model/Filter/Template.php
+++ b/app/code/Magento/PageBuilder/Model/Filter/Template.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -170,7 +170,12 @@ function ($errorNumber, $errorString) {
                 throw new DOMException($errorString, $errorNumber);
             }
         );
-        $string = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8');
+        $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+        $string = mb_encode_numericentity(
+            $html,
+            $convmap,
+            'UTF-8'
+        );
         try {
             libxml_use_internal_errors(true);
             // LIBXML_SCHEMA_CREATE option added according to this message
@@ -216,7 +221,7 @@ private function generateDecodedHtmlPlaceholderMappingInDocument(DOMDocument $do
             $htmlContentTypeNode->setAttribute('data-decoded', 'true');
 
             // if nothing exists inside the node, continue
-            if (!strlen(trim($htmlContentTypeNode->nodeValue))) {
+            if (!strlen(trim($htmlContentTypeNode->nodeValue ?? ''))) {
                 continue;
             }
 
diff --git a/app/code/Magento/PageBuilder/Model/GoogleMaps/ApiKeyValidator.php b/app/code/Magento/PageBuilder/Model/GoogleMaps/ApiKeyValidator.php
index 4c1b3604458..42b42ced84f 100644
--- a/app/code/Magento/PageBuilder/Model/GoogleMaps/ApiKeyValidator.php
+++ b/app/code/Magento/PageBuilder/Model/GoogleMaps/ApiKeyValidator.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -9,7 +9,7 @@
 
 class ApiKeyValidator
 {
-    const GOOGLE_MAPS_EMBED_URL = 'https://www.google.com/maps/embed/v1/place?key=%s&q=Austin+TX';
+    public const GOOGLE_MAPS_EMBED_URL = 'https://www.google.com/maps/embed/v1/place?key=%s&q=Austin+TX';
 
     /**
      * Send test request to Google Maps and return response
@@ -20,9 +20,13 @@ class ApiKeyValidator
     public function validate(string $apiKey): array
     {
         $testUrl = sprintf(self::GOOGLE_MAPS_EMBED_URL, $apiKey);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $curl = curl_init($testUrl);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $result = curl_exec($curl);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         $returnArray = [
             'responseMessage' => $responseCode !== 200 ? $result : '',
diff --git a/app/code/Magento/PageBuilder/Model/ResourceModel/Template.php b/app/code/Magento/PageBuilder/Model/ResourceModel/Template.php
index 57576a85d2d..7eab71a5bb4 100644
--- a/app/code/Magento/PageBuilder/Model/ResourceModel/Template.php
+++ b/app/code/Magento/PageBuilder/Model/ResourceModel/Template.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Collection.php b/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Collection.php
index 2f80ae6b5e4..bb1a337bb18 100644
--- a/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Collection.php
+++ b/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Collection.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php b/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php
index 4c7034bd162..eadc9cd2db5 100644
--- a/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php
+++ b/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -31,6 +31,12 @@ class Collection extends TemplateCollection implements SearchResultInterface
      */
     private $aggregations;
 
+    /** @var string */
+    private $model;
+
+    /** @var string */
+    private $resourceModel;
+
     /**
      * @param EntityFactoryInterface $entityFactory
      * @param LoggerInterface $logger
@@ -56,8 +62,10 @@ public function __construct(
         $resourceModel,
         $model = Document::class,
         $connection = null,
-        AbstractDb $resource = null
+        ?AbstractDb $resource = null
     ) {
+        $this->resourceModel = $resourceModel;
+        $this->model = $model;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -68,10 +76,19 @@ public function __construct(
         );
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
-        $this->_init($model, $resourceModel);
+        $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_init($this->model, $this->resourceModel);
+    }
+
     /**
      * Get aggregations
      *
@@ -111,7 +128,7 @@ public function getSearchCriteria()
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function setSearchCriteria(SearchCriteriaInterface $searchCriteria = null)
+    public function setSearchCriteria(?SearchCriteriaInterface $searchCriteria = null)
     {
         return $this;
     }
@@ -145,7 +162,7 @@ public function setTotalCount($totalCount)
      * @return $this
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function setItems(array $items = null)
+    public function setItems(?array $items = null)
     {
         return $this;
     }
diff --git a/app/code/Magento/PageBuilder/Model/Session/RandomKey.php b/app/code/Magento/PageBuilder/Model/Session/RandomKey.php
index 6c93abeef09..ee31dcdcea3 100644
--- a/app/code/Magento/PageBuilder/Model/Session/RandomKey.php
+++ b/app/code/Magento/PageBuilder/Model/Session/RandomKey.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Source/VisualSelect.php b/app/code/Magento/PageBuilder/Model/Source/VisualSelect.php
index 6f5fc74b5c6..e0f84b0fd04 100644
--- a/app/code/Magento/PageBuilder/Model/Source/VisualSelect.php
+++ b/app/code/Magento/PageBuilder/Model/Source/VisualSelect.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Config.php b/app/code/Magento/PageBuilder/Model/Stage/Config.php
index 63e268e7465..07e3bff2677 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Config.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Config.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -24,17 +24,17 @@
  */
 class Config
 {
-    const DEFAULT_PREVIEW_COMPONENT = 'Magento_PageBuilder/js/content-type/preview';
-    const DEFAULT_MASTER_COMPONENT = 'Magento_PageBuilder/js/content-type/master';
+    public const DEFAULT_PREVIEW_COMPONENT = 'Magento_PageBuilder/js/content-type/preview';
+    public const DEFAULT_MASTER_COMPONENT = 'Magento_PageBuilder/js/content-type/master';
 
-    const XML_PATH_COLUMN_GRID_DEFAULT = 'cms/pagebuilder/column_grid_default';
-    const XML_PATH_COLUMN_GRID_MAX = 'cms/pagebuilder/column_grid_max';
+    public const XML_PATH_COLUMN_GRID_DEFAULT = 'cms/pagebuilder/column_grid_default';
+    public const XML_PATH_COLUMN_GRID_MAX = 'cms/pagebuilder/column_grid_max';
 
-    const ROOT_CONTAINER_NAME = 'root-container';
+    public const ROOT_CONTAINER_NAME = 'root-container';
 
-    const TEMPLATE_DELETE_RESOURCE = 'Magento_PageBuilder::template_delete';
-    const TEMPLATE_SAVE_RESOURCE = 'Magento_PageBuilder::template_save';
-    const TEMPLATE_APPLY_RESOURCE = 'Magento_PageBuilder::template_apply';
+    public const TEMPLATE_DELETE_RESOURCE = 'Magento_PageBuilder::template_delete';
+    public const TEMPLATE_SAVE_RESOURCE = 'Magento_PageBuilder::template_save';
+    public const TEMPLATE_APPLY_RESOURCE = 'Magento_PageBuilder::template_apply';
 
     private const CONTENT_TYPE_CACHE_ID = 'CONTENT_TYPE';
     private const TINY_MCE_CONFIG_CACHE_ID = 'TINY_MCE_CONFIG';
@@ -158,11 +158,11 @@ public function __construct(
         \Magento\PageBuilder\Model\WidgetInitializerConfig $widgetInitializerConfig,
         array $rootContainerConfig = [],
         array $data = [],
-        \Magento\Widget\Model\Widget\Config $widgetConfig = null,
-        \Magento\Variable\Model\Variable\Config $variableConfig = null,
-        AuthorizationInterface $authorization = null,
-        FrontendInterface $cache = null,
-        Json $serializer = null,
+        ?\Magento\Widget\Model\Widget\Config $widgetConfig = null,
+        ?\Magento\Variable\Model\Variable\Config $variableConfig = null,
+        ?AuthorizationInterface $authorization = null,
+        ?FrontendInterface $cache = null,
+        ?Json $serializer = null,
         ?RandomKey $sessionRandomKey = null
     ) {
         $this->config = $config;
@@ -223,7 +223,8 @@ private function getAcl()
     {
         return [
             'template_save' => $this->authorization->isAllowed(self::TEMPLATE_SAVE_RESOURCE),
-            'template_apply' => $this->authorization->isAllowed(self::TEMPLATE_APPLY_RESOURCE)
+            'template_apply' => $this->authorization->isAllowed(self::TEMPLATE_APPLY_RESOURCE),
+            'widget' => $this->authorization->isAllowed('Magento_Widget::widget_instance')
         ];
     }
 
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Config/UiComponentConfig.php b/app/code/Magento/PageBuilder/Model/Stage/Config/UiComponentConfig.php
index 94ea4095ee6..20d721f6ef3 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Config/UiComponentConfig.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Config/UiComponentConfig.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php b/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php
index 9a4f2de0230..0f65445a4d4 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/HtmlFilter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -41,11 +41,17 @@ public function __construct(
     public function filterHtml(string $content): string
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
+        $previous = '';
         try {
             //this code is required because of https://bugs.php.net/bug.php?id=60021
             $previous = libxml_use_internal_errors(true);
             $content = '<div>' . $content . '</div>';
-            $string = mb_convert_encoding($content, 'HTML-ENTITIES', 'UTF-8');
+            $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+            $string = mb_encode_numericentity(
+                $content,
+                $convmap,
+                'UTF-8'
+            );
             $dom->loadHTML($string, LIBXML_HTML_NOIMPLIED | LIBXML_HTML_NODEFDTD);
         } catch (\Exception $e) {
             $this->loggerInterface->critical($e->getMessage());
@@ -72,17 +78,43 @@ public function filterHtml(string $content): string
         );
         foreach ($htmlContentTypes as $htmlContentType) {
             /* @var \DOMElement $htmlContentType */
-            $innerHTML = '';
-            $children = $htmlContentType->childNodes;
-            foreach ($children as $child) {
-                $innerHTML .= $child->ownerDocument->saveXML($child);
-            }
             $htmlContentType->setAttribute(
                 "class",
                 $htmlContentType->getAttribute("class") . " placeholder-html-code"
             );
+
+            $innerHTML = $this->getChildrenInnerHtml($htmlContentType);
+
             $htmlContentType->nodeValue = htmlentities($innerHTML);
         }
         return substr(trim($dom->saveHTML()), 5, -6);
     }
+
+    /**
+     * Get inner HTML of element's children
+     *
+     * @param \DOMElement $element
+     * @return string
+     */
+    private function getChildrenInnerHtml(\DOMElement $element): string
+    {
+        $innerHTML = '';
+        $childrenIterator = $element->childNodes->getIterator();
+        while ($childrenIterator->valid()) {
+            $child = $childrenIterator->current();
+            try {
+                $ownerDocument = $child->ownerDocument;
+            } catch (\Error $error) {
+                $ownerDocument = null;
+                $this->loggerInterface->critical($error->getMessage());
+            }
+            if ($ownerDocument === null) {
+                $childrenIterator->next();
+                continue;
+            }
+            $innerHTML .= $ownerDocument->saveXML($child);
+            $childrenIterator->next();
+        }
+        return $innerHTML;
+    }
 }
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Preview.php b/app/code/Magento/PageBuilder/Model/Stage/Preview.php
index 7a3619ad80f..ef37a42d01e 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Preview.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Preview.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php
index c9be7e404cf..75498e8b93c 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -46,7 +46,7 @@ public function __construct(
         \Magento\PageBuilder\Model\Config $config,
         \Magento\Framework\View\Element\BlockFactory $blockFactory,
         ResultFactory $resultFactory,
-        Template $templateFilter = null
+        ?Template $templateFilter = null
     ) {
         $this->config = $config;
         $this->blockFactory = $blockFactory;
@@ -68,9 +68,9 @@ public function render(array $params): array
         ];
 
         $contentTypes = $this->config->getContentTypes();
-        $backendBlockClassName = isset($contentTypes[$params['role']]['backend_block'])
+        $backendBlockClassName = isset($params['role']) && isset($contentTypes[$params['role']]['backend_block'])
             ? $contentTypes[$params['role']]['backend_block'] : false;
-        $backendBlockTemplate = isset($contentTypes[$params['role']]['backend_template'])
+        $backendBlockTemplate = isset($params['role']) && isset($contentTypes[$params['role']]['backend_template'])
             ? $contentTypes[$params['role']]['backend_template'] : false;
 
         if ($backendBlockTemplate) {
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
index bc469c7a2cf..d4e85c4b2db 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -56,7 +56,7 @@ public function __construct(
         WidgetDirective $widgetDirectiveRenderer,
         LoggerInterface $loggerInterface,
         HtmlFilter $htmlFilter,
-        Template $templateFilter = null
+        ?Template $templateFilter = null
     ) {
         $this->blockCollectionFactory = $blockCollectionFactory;
         $this->widgetDirectiveRenderer = $widgetDirectiveRenderer;
diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php
index d8799932735..46ff12f8937 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -41,7 +41,7 @@ class WidgetDirective implements \Magento\PageBuilder\Model\Stage\RendererInterf
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Widget\Model\Template\Filter $directiveFilter,
-        Template $templateFilter = null
+        ?Template $templateFilter = null
     ) {
         $this->storeManager = $storeManager;
         $this->directiveFilter = $directiveFilter;
diff --git a/app/code/Magento/PageBuilder/Model/Stage/RendererInterface.php b/app/code/Magento/PageBuilder/Model/Stage/RendererInterface.php
index f23c4f59d82..8f445dc277b 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/RendererInterface.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/RendererInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Stage/RendererPool.php b/app/code/Magento/PageBuilder/Model/Stage/RendererPool.php
index 7144ff5eedb..aeb92853d51 100644
--- a/app/code/Magento/PageBuilder/Model/Stage/RendererPool.php
+++ b/app/code/Magento/PageBuilder/Model/Stage/RendererPool.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Model/State.php b/app/code/Magento/PageBuilder/Model/State.php
index 0955017fd8c..c7824ba8a66 100644
--- a/app/code/Magento/PageBuilder/Model/State.php
+++ b/app/code/Magento/PageBuilder/Model/State.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -25,7 +25,8 @@ public function __construct(Config $config)
 
     /**
      * Returns information if use page builder based on system configuration and xml configuration
-     * @param $isPageBuilderUsed
+     *
+     * @param mixed $isPageBuilderUsed
      * @return bool
      */
     public function isPageBuilderInUse($isPageBuilderUsed) : bool
diff --git a/app/code/Magento/PageBuilder/Model/Template.php b/app/code/Magento/PageBuilder/Model/Template.php
index 1d9d95cc7fe..2b7243a29f2 100644
--- a/app/code/Magento/PageBuilder/Model/Template.php
+++ b/app/code/Magento/PageBuilder/Model/Template.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -18,6 +18,9 @@
  */
 class Template extends AbstractExtensibleModel implements TemplateInterface
 {
+    /**
+     * @var string
+     */
     protected $_eventPrefix = 'pagebuilder_template';
 
     /**
diff --git a/app/code/Magento/PageBuilder/Model/Template/Source/TemplateTypes.php b/app/code/Magento/PageBuilder/Model/Template/Source/TemplateTypes.php
index e7475395c0b..6107feec999 100644
--- a/app/code/Magento/PageBuilder/Model/Template/Source/TemplateTypes.php
+++ b/app/code/Magento/PageBuilder/Model/Template/Source/TemplateTypes.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -35,6 +35,7 @@ public function __construct(Config $config)
     public function toOptionArray()
     {
         $templateTypes = $this->config->getConfig()['stage_config']['template_types'];
+        $options = [];
         foreach ($templateTypes as $key => $value) {
             $options[] = [
                 'label' => $value,
diff --git a/app/code/Magento/PageBuilder/Model/TemplateRepository.php b/app/code/Magento/PageBuilder/Model/TemplateRepository.php
index adb918b301a..85559d524db 100644
--- a/app/code/Magento/PageBuilder/Model/TemplateRepository.php
+++ b/app/code/Magento/PageBuilder/Model/TemplateRepository.php
@@ -1,19 +1,21 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model;
 
 use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
 use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Filesystem;
+use Magento\Framework\Image\Factory;
 use Magento\PageBuilder\Api\Data\TemplateInterface;
 use Magento\PageBuilder\Api\Data\TemplateSearchResultsInterfaceFactory;
 use Magento\PageBuilder\Api\TemplateRepositoryInterface;
@@ -71,6 +73,7 @@ class TemplateRepository implements TemplateRepositoryInterface
      * @param CollectionProcessorInterface $collectionProcessor
      * @param Filesystem $filesystem
      * @param Database $mediaStorage
+     * @param Factory $imageFactory
      */
     public function __construct(
         ResourceTemplate $resource,
@@ -79,7 +82,8 @@ public function __construct(
         TemplateSearchResultsInterfaceFactory $searchResultsFactory,
         CollectionProcessorInterface $collectionProcessor,
         Filesystem $filesystem,
-        Database $mediaStorage
+        Database $mediaStorage,
+        private readonly Factory $imageFactory
     ) {
         $this->resource = $resource;
         $this->templateFactory = $templateFactory;
@@ -142,25 +146,14 @@ public function getList(SearchCriteriaInterface $criteria)
      */
     public function delete(TemplateInterface $template) : bool
     {
-        $mediaDir = $this->filesystem
-            ->getDirectoryWrite(\Magento\Framework\App\Filesystem\DirectoryList::MEDIA);
-
         try {
             $templateModel = $this->templateFactory->create();
             $this->resource->load($templateModel, $template->getTemplateId());
             $this->resource->delete($templateModel);
             $previewImage = $template->getPreviewImage();
             $previewThumbImage = $templateModel->getPreviewThumbnailImage();
-
-            // Remove the preview image from the media directory
-            if ($mediaDir->isExist($previewImage)) {
-                $mediaDir->delete($previewImage);
-            }
-            if ($mediaDir->isExist($previewThumbImage)) {
-                $mediaDir->delete($previewThumbImage);
-            }
-            $this->mediaStorage->deleteFile($previewImage);
-            $this->mediaStorage->deleteFile($previewThumbImage);
+            $this->deletePreviewImage($previewImage);
+            $this->deletePreviewImage($previewThumbImage);
         } catch (\Exception $exception) {
             throw new CouldNotDeleteException(
                 __('Could not delete the Template: %1', $exception->getMessage())
@@ -170,6 +163,32 @@ public function delete(TemplateInterface $template) : bool
         return true;
     }
 
+    /**
+     * Checks if preview image is valid and tries to delete it
+     *
+     * @param string $imageName
+     * @return void
+     * @throws FileSystemException
+     */
+    private function deletePreviewImage(string $imageName): void
+    {
+        $isValid = true;
+        $mediaDir = $this->filesystem
+            ->getDirectoryWrite(DirectoryList::MEDIA);
+
+        try {
+            $this->imageFactory->create($mediaDir->getAbsolutePath().$imageName);
+        } catch (\Exception) {
+            $isValid = false;
+        }
+
+        if ($mediaDir->isExist($imageName) && $isValid) {
+            $mediaDir->delete($imageName);
+        }
+
+        $this->mediaStorage->deleteFile($imageName);
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/app/code/Magento/PageBuilder/Model/UpgradableEntitiesPool.php b/app/code/Magento/PageBuilder/Model/UpgradableEntitiesPool.php
index 2c3a6c6bffc..862241ccbb5 100644
--- a/app/code/Magento/PageBuilder/Model/UpgradableEntitiesPool.php
+++ b/app/code/Magento/PageBuilder/Model/UpgradableEntitiesPool.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\PageBuilder\Model;
 
diff --git a/app/code/Magento/PageBuilder/Model/Validator/IframeSrcAttributeValidator.php b/app/code/Magento/PageBuilder/Model/Validator/IframeSrcAttributeValidator.php
index 46822607ea7..f05b0ae9c71 100644
--- a/app/code/Magento/PageBuilder/Model/Validator/IframeSrcAttributeValidator.php
+++ b/app/code/Magento/PageBuilder/Model/Validator/IframeSrcAttributeValidator.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/Validator/InnerHtmlValidator.php b/app/code/Magento/PageBuilder/Model/Validator/InnerHtmlValidator.php
index 05112e87ec6..4648db4bc53 100644
--- a/app/code/Magento/PageBuilder/Model/Validator/InnerHtmlValidator.php
+++ b/app/code/Magento/PageBuilder/Model/Validator/InnerHtmlValidator.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/View/File/Collector/PageBuilder.php b/app/code/Magento/PageBuilder/Model/View/File/Collector/PageBuilder.php
index 058e31ebda7..416bbd6a261 100644
--- a/app/code/Magento/PageBuilder/Model/View/File/Collector/PageBuilder.php
+++ b/app/code/Magento/PageBuilder/Model/View/File/Collector/PageBuilder.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php b/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php
index 2c6234e49e9..3660dee4626 100644
--- a/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php
+++ b/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -32,7 +32,7 @@ class WidgetInitializerConfig
      */
     public function __construct(
         array $config,
-        ConfigInterface $viewConfig = null
+        ?ConfigInterface $viewConfig = null
     ) {
         $this->config = $config;
         $this->viewConfig = $viewConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
diff --git a/app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php b/app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php
index 15d8a435634..1fcc45596fe 100644
--- a/app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php
+++ b/app/code/Magento/PageBuilder/Model/Wysiwyg/DefaultConfigProvider.php
@@ -1,31 +1,34 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Wysiwyg;
 
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Asset\Repository;
+
 /**
  * This DefaultConfigProvider overrides existing configuration provided from the cms module
  */
 class DefaultConfigProvider implements \Magento\Framework\Data\Wysiwyg\ConfigProviderInterface
 {
     /**
-     * @var \Magento\Framework\View\Asset\Repository
+     * @var Repository
      */
-    private $assetRepo;
+    private Repository $assetRepo;
     /**
      * @var array
      */
     private $additionalSettings;
     /**
-     * @param \Magento\Framework\View\Asset\Repository $assetRepo
+     * @param Repository $assetRepo
      * @param array $additionalSettings
      */
     public function __construct(
-        \Magento\Framework\View\Asset\Repository $assetRepo,
+        Repository $assetRepo,
         array $additionalSettings
     ) {
         $this->assetRepo = $assetRepo;
@@ -34,15 +37,15 @@ public function __construct(
     /**
      * Returns configuration data
      *
-     * @param \Magento\Framework\DataObject $config
-     * @return \Magento\Framework\DataObject
+     * @param DataObject $config
+     * @return DataObject
      */
-    public function getConfig(\Magento\Framework\DataObject $config): \Magento\Framework\DataObject
+    public function getConfig(DataObject $config): DataObject
     {
         $config->addData(
             [
                 'tinymce' => [
-                    'toolbar' => 'undo redo | styleselect | fontsizeselect | lineheight | forecolor backcolor ' .
+                    'toolbar' => 'undo redo | styles | fontfamily fontsizeinput | lineheight | forecolor backcolor ' .
                         '| bold italic underline | alignleft aligncenter alignright | numlist bullist ' .
                         '| link image table charmap',
 
@@ -55,9 +58,7 @@ public function getConfig(\Magento\Framework\DataObject $config): \Magento\Frame
                             'link',
                             'charmap',
                             'media',
-                            'noneditable',
                             'table',
-                            'paste',
                             'code',
                             'help',
                             'table',
diff --git a/app/code/Magento/PageBuilder/Model/Wysiwyg/InlineEditingSupportedAdapterList.php b/app/code/Magento/PageBuilder/Model/Wysiwyg/InlineEditingSupportedAdapterList.php
index e1693d93939..aebf2bf8a03 100644
--- a/app/code/Magento/PageBuilder/Model/Wysiwyg/InlineEditingSupportedAdapterList.php
+++ b/app/code/Magento/PageBuilder/Model/Wysiwyg/InlineEditingSupportedAdapterList.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -37,6 +37,7 @@ public function __construct(
 
     /**
      * Check if inline editing available for current adapter
+     *
      * @param string $editorPath
      * @return bool
      */
diff --git a/app/code/Magento/PageBuilder/Observer/ClearModalDismissedCookie.php b/app/code/Magento/PageBuilder/Observer/ClearModalDismissedCookie.php
index 1e2ee2eb7ea..eeb9048d18a 100644
--- a/app/code/Magento/PageBuilder/Observer/ClearModalDismissedCookie.php
+++ b/app/code/Magento/PageBuilder/Observer/ClearModalDismissedCookie.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Plugin/Catalog/Block/Product/ProductsListPlugin.php b/app/code/Magento/PageBuilder/Plugin/Catalog/Block/Product/ProductsListPlugin.php
index 069ba3aeb48..5936ed6be67 100644
--- a/app/code/Magento/PageBuilder/Plugin/Catalog/Block/Product/ProductsListPlugin.php
+++ b/app/code/Magento/PageBuilder/Plugin/Catalog/Block/Product/ProductsListPlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Plugin/Catalog/Model/Product/Attribute/RepositoryPlugin.php b/app/code/Magento/PageBuilder/Plugin/Catalog/Model/Product/Attribute/RepositoryPlugin.php
index c566c4d5c2a..4f3ce14ae2e 100644
--- a/app/code/Magento/PageBuilder/Plugin/Catalog/Model/Product/Attribute/RepositoryPlugin.php
+++ b/app/code/Magento/PageBuilder/Plugin/Catalog/Model/Product/Attribute/RepositoryPlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -36,8 +36,9 @@ public function beforeSave(
         \Magento\Catalog\Model\Product\Attribute\Repository $subject,
         \Magento\Catalog\Api\Data\ProductAttributeInterface $attribute
     ) {
-        $isPageBuilderEnabled = $attribute->getData('extension_attributes')
-            ? $attribute->getData('extension_attributes')->getIsPagebuilderEnabled()
+        $extensionAttributes = $attribute->getData('extension_attributes');
+        $isPageBuilderEnabled = ($extensionAttributes && method_exists($extensionAttributes, 'getIsPagebuilderEnabled'))
+            ? $extensionAttributes->getIsPagebuilderEnabled()
             : 0;
         $attribute->setData('is_pagebuilder_enabled', $isPageBuilderEnabled);
     }
@@ -58,7 +59,11 @@ public function afterGet(
         $extensionAttribute = $result->getExtensionAttributes()
             ? $result->getExtensionAttributes()
             : $this->extensionAttributesFactory->create();
-        $extensionAttribute->setIsPagebuilderEnabled($isPageBuilderEnabled);
+
+        if (method_exists($extensionAttribute, 'setIsPagebuilderEnabled')) {
+            $extensionAttribute->setIsPagebuilderEnabled($isPageBuilderEnabled);
+        }
+
         $result->setExtensionAttributes($extensionAttribute);
         return $result;
     }
diff --git a/app/code/Magento/PageBuilder/Plugin/Catalog/Ui/DataProvider/Product/Form/Modifier/EavPlugin.php b/app/code/Magento/PageBuilder/Plugin/Catalog/Ui/DataProvider/Product/Form/Modifier/EavPlugin.php
index 5e1437e5e85..7c576a61846 100644
--- a/app/code/Magento/PageBuilder/Plugin/Catalog/Ui/DataProvider/Product/Form/Modifier/EavPlugin.php
+++ b/app/code/Magento/PageBuilder/Plugin/Catalog/Ui/DataProvider/Product/Form/Modifier/EavPlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types = 1);
diff --git a/app/code/Magento/PageBuilder/Plugin/ClearEditorConfigCache.php b/app/code/Magento/PageBuilder/Plugin/ClearEditorConfigCache.php
index 19c0944e2d9..753d8cd8be9 100644
--- a/app/code/Magento/PageBuilder/Plugin/ClearEditorConfigCache.php
+++ b/app/code/Magento/PageBuilder/Plugin/ClearEditorConfigCache.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Plugin/DesignLoader.php b/app/code/Magento/PageBuilder/Plugin/DesignLoader.php
index 4d9131c4cea..dda1d773102 100644
--- a/app/code/Magento/PageBuilder/Plugin/DesignLoader.php
+++ b/app/code/Magento/PageBuilder/Plugin/DesignLoader.php
@@ -1,13 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Plugin;
 
 use Magento\Catalog\Model\Product;
+use Magento\Framework\App\AreaList;
+use Magento\Framework\App\State;
+use Magento\Framework\Message\ManagerInterface;
 use Magento\Framework\Message\MessageInterface;
 
 /**
@@ -16,17 +19,21 @@
 class DesignLoader
 {
     /**
-     * @var \Magento\Framework\View\DesignLoader
+     * @var ManagerInterface
      */
-    private $designLoader;
+    private $messageManager;
 
     /**
-     * @var \Magento\Framework\Message\ManagerInterface
+     * Application arealist
+     *
+     * @var AreaList
      */
-    private $messageManager;
+    private $areaList;
 
     /**
-     * @var \Magento\Framework\App\State
+     * Application State
+     *
+     * @var State
      */
     private $appState;
 
@@ -36,21 +43,21 @@ class DesignLoader
     private $preview;
 
     /**
-     * @param \Magento\Framework\View\DesignLoader $designLoader
      * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param \Magento\Framework\App\State $appState
      * @param \Magento\PageBuilder\Model\Stage\Preview $preview
+     * @param AreaList $areaList
      */
     public function __construct(
-        \Magento\Framework\View\DesignLoader $designLoader,
         \Magento\Framework\Message\ManagerInterface $messageManager,
         \Magento\Framework\App\State $appState,
-        \Magento\PageBuilder\Model\Stage\Preview $preview
+        \Magento\PageBuilder\Model\Stage\Preview $preview,
+        AreaList $areaList
     ) {
-        $this->designLoader = $designLoader;
         $this->messageManager = $messageManager;
         $this->appState = $appState;
         $this->preview = $preview;
+        $this->areaList = $areaList;
     }
 
     /**
@@ -68,7 +75,7 @@ public function beforeCreate(
         \Magento\Catalog\Block\Product\ImageFactory $subject,
         Product $product,
         string $imageId,
-        array $attributes = null
+        ?array $attributes = null
     ) {
         if ($this->preview->isPreviewMode()) {
             $this->appState->emulateAreaCode(
@@ -84,7 +91,8 @@ public function beforeCreate(
     public function loadDesignConfig()
     {
         try {
-            $this->designLoader->load();
+            $area = $this->areaList->getArea($this->appState->getAreaCode());
+            $area->load(\Magento\Framework\App\Area::PART_DESIGN);
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             if ($e->getPrevious() instanceof \Magento\Framework\Config\Dom\ValidationException) {
                 /** @var MessageInterface $message */
diff --git a/app/code/Magento/PageBuilder/Plugin/Filter/CustomVarTemplate.php b/app/code/Magento/PageBuilder/Plugin/Filter/CustomVarTemplate.php
index cae8e4cb267..3a2661b1e01 100644
--- a/app/code/Magento/PageBuilder/Plugin/Filter/CustomVarTemplate.php
+++ b/app/code/Magento/PageBuilder/Plugin/Filter/CustomVarTemplate.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php b/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php
index 13880eed127..bb68ffc4772 100644
--- a/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php
+++ b/app/code/Magento/PageBuilder/Plugin/Filter/TemplatePlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,9 +15,9 @@
  */
 class TemplatePlugin
 {
-    const BACKGROUND_IMAGE_PATTERN = '/data-background-images=(?:\'|"){.+}(?:\'|")/si';
+    public const BACKGROUND_IMAGE_PATTERN = '/data-background-images=(?:\'|"){.+}(?:\'|")/si';
 
-    const HTML_CONTENT_TYPE_PATTERN = '/data-content-type="html"/si';
+    public const HTML_CONTENT_TYPE_PATTERN = '/data-content-type="html"/si';
 
     /**
      * @var TemplateFilter
diff --git a/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php b/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php
index a1e9d943a18..5d9e878d76b 100644
--- a/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php
+++ b/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\PageBuilder\Plugin\Framework\Session;
 
diff --git a/app/code/Magento/PageBuilder/Plugin/Model/Eav/Adminhtml/System/Config/Source/InputtypePlugin.php b/app/code/Magento/PageBuilder/Plugin/Model/Eav/Adminhtml/System/Config/Source/InputtypePlugin.php
index 5b701f0ce11..5ef55017194 100644
--- a/app/code/Magento/PageBuilder/Plugin/Model/Eav/Adminhtml/System/Config/Source/InputtypePlugin.php
+++ b/app/code/Magento/PageBuilder/Plugin/Model/Eav/Adminhtml/System/Config/Source/InputtypePlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Plugin/Model/Eav/Attribute/PresentationPlugin.php b/app/code/Magento/PageBuilder/Plugin/Model/Eav/Attribute/PresentationPlugin.php
index 1bbbfe3df53..10f83775aa4 100644
--- a/app/code/Magento/PageBuilder/Plugin/Model/Eav/Attribute/PresentationPlugin.php
+++ b/app/code/Magento/PageBuilder/Plugin/Model/Eav/Attribute/PresentationPlugin.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Plugin/Result/Page.php b/app/code/Magento/PageBuilder/Plugin/Result/Page.php
index a3b6d27e1b3..4ef0aea32d6 100644
--- a/app/code/Magento/PageBuilder/Plugin/Result/Page.php
+++ b/app/code/Magento/PageBuilder/Plugin/Result/Page.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -14,6 +14,8 @@
 class Page
 {
     /**
+     * Adjusts the layout handles classes to the body when using full width variants
+     *
      * @param ResultPage $subject
      * @param ResponseInterface $response
      * @return array
diff --git a/app/code/Magento/PageBuilder/README.md b/app/code/Magento/PageBuilder/README.md
index 98ea4d1d53a..b74195551d0 100644
--- a/app/code/Magento/PageBuilder/README.md
+++ b/app/code/Magento/PageBuilder/README.md
@@ -20,7 +20,7 @@ This setting determines the `is_pagebuilder_enabled` configuration value.
 
 You can disable the PageBuilder module for a specific field by adding the following entry to a field configuration in an XML configuration file:
 
-```
+```xml
 <item name="wysiwygConfigData" xsi:type="array">
     <item name="is_pagebuilder_enabled" xsi:type="boolean">false</item>
 </item>
@@ -30,7 +30,7 @@ You can disable the PageBuilder module for a specific field by adding the follow
 
 The following example disables the PageBuilder editor for the content field.
 
-```
+```xml
 <form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
     <fieldset name="content" sortOrder="10">
         <field name="content" formElement="wysiwyg">
diff --git a/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php b/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php
index e84b03c87a1..f27d8675800 100644
--- a/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php
+++ b/app/code/Magento/PageBuilder/Setup/Converters/PageBuilderStripStyles.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types = 1);
diff --git a/app/code/Magento/PageBuilder/Setup/Patch/Data/UpdateProductAttribute.php b/app/code/Magento/PageBuilder/Setup/Patch/Data/UpdateProductAttribute.php
index 8363771a86f..d4e0a26cbe9 100644
--- a/app/code/Magento/PageBuilder/Setup/Patch/Data/UpdateProductAttribute.php
+++ b/app/code/Magento/PageBuilder/Setup/Patch/Data/UpdateProductAttribute.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php b/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php
index 98909e24bae..e38e3ccb83e 100644
--- a/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php
+++ b/app/code/Magento/PageBuilder/Setup/Patch/Data/UpgradePageBuilderStripStyles.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types = 1);
diff --git a/app/code/Magento/PageBuilder/Setup/UpgradeContentHelper.php b/app/code/Magento/PageBuilder/Setup/UpgradeContentHelper.php
index 9c55a1a5417..add78485d8b 100644
--- a/app/code/Magento/PageBuilder/Setup/UpgradeContentHelper.php
+++ b/app/code/Magento/PageBuilder/Setup/UpgradeContentHelper.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\PageBuilder\Setup;
 
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AddPageBuilderPageTitleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AddPageBuilderPageTitleActionGroup.xml
index 7673d4ebdf8..a37b6fb1f41 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AddPageBuilderPageTitleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AddPageBuilderPageTitleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AdminNavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AdminNavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup.xml
index d9b31f1a00f..d1980bcc586 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AdminNavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AdminNavigateToCreatedCMSPageWithEnabledSecretKeyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToAPageWithPageBuilderActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToAPageWithPageBuilderActionGroup.xml
index 3fb5b24dd98..eb0288cd30c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToAPageWithPageBuilderActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToAPageWithPageBuilderActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToCMSPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToCMSPageActionGroup.xml
index 06c90a55a40..093777ba371 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToCMSPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToCMSPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageActionGroup.xml
index 67984917b39..098ee56dde3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/SwitchToPageBuilderStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -15,7 +15,7 @@
             <argument name="editButtonSelector" defaultValue="{{PageBuilderStage.editButtonSelector}}" type="string"/>
             <argument name="rowIndex" defaultValue="1" type="string"/>
         </arguments>
-        <waitForElementVisible time="30" selector="{{sectionSelector}}" stepKey="waitForSection"/>
+        <waitForElementClickable selector="{{sectionSelector}}" stepKey="waitForSection"/>
         <conditionalClick selector="{{sectionSelector}}" dependentSelector="{{sectionDependentSelector}}" visible="false" stepKey="expandSection"/>
         <waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
         <waitForElementVisible time="30" selector="{{snapshotSelector}}" stepKey="waitForSnapshot"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyFullWidthLayoutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyFullWidthLayoutActionGroup.xml
index c52879c6826..2dbc4deb21c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyFullWidthLayoutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyFullWidthLayoutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -12,7 +12,7 @@
             <argument name="index" defaultValue="0" type="string"/>
         </arguments>
         <executeJS function="return document.querySelectorAll('[data-content-type=row]')[{{index}}].clientWidth" stepKey="rowWidth"/>
-        <executeJS function="return document.querySelector('[class=page-wrapper]').clientWidth" stepKey="pageWidth"/>
+        <executeJS function="return document.querySelector('main#maincontent').clientWidth" stepKey="pageWidth"/>
         <assertEquals stepKey="assertRowWidth100Percent">
             <expectedResult type="variable">pageWidth</expectedResult>
             <actualResult type="variable">rowWidth</actualResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderNotVisibleOnPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderNotVisibleOnPageActionGroup.xml
index ff22895e0f8..3a27957cdb8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderNotVisibleOnPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderNotVisibleOnPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnPageActionGroup.xml
index ef1f1c1bf90..d574620dd91 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnStagingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnStagingActionGroup.xml
index dfc6be04623..9233c9ba5c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnStagingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/VerifyPageBuilderVisibleOnStagingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
index 2c6ba7401c3..ce4c839bdec 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
index 1c5b811bb94..ce1c7caf18c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminSetPageBuilderContentPreviewActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminSetPageBuilderContentPreviewActionGroup.xml
index 37545dec2c2..09638476b7b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminSetPageBuilderContentPreviewActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminSetPageBuilderContentPreviewActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminSetPageBuilderContentPreviewActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsActionGroup.xml
index 634367d74e0..e4df15d9426 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsAndPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsAndPaddingActionGroup.xml
index e5472704bb9..6e79472cfa4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsAndPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldMarginsAndPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldPaddingActionGroup.xml
index 95947ad9a5d..50e7d245da8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ClearSlideOutPanelFieldPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsActionGroup.xml
index e37945d7d09..f3f14299438 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsAndPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsAndPaddingActionGroup.xml
index 17cd17604e3..68dcba80da1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsAndPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldMarginsAndPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldPaddingActionGroup.xml
index 6feeb7c01fb..90567dd74aa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelFieldPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelSingleFieldMarginsOrPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelSingleFieldMarginsOrPaddingActionGroup.xml
index 534c3a69e4c..858844a93da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelSingleFieldMarginsOrPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/FillSlideOutPanelSingleFieldMarginsOrPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginFieldsSlideOutPanelActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginFieldsSlideOutPanelActionGroup.xml
index 4c2ad29b02c..b3b1ece62f4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginFieldsSlideOutPanelActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginFieldsSlideOutPanelActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="seeInMarginFieldsSlideOutPanel">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginsAndPaddingFieldSlideOutPanelActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginsAndPaddingFieldSlideOutPanelActionGroup.xml
index a46001a5f5d..75a05add65d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginsAndPaddingFieldSlideOutPanelActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInMarginsAndPaddingFieldSlideOutPanelActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInPaddingFieldsSlideOutPanelActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInPaddingFieldsSlideOutPanelActionGroup.xml
index e24d93d16a5..0a68cce482e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInPaddingFieldsSlideOutPanelActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/SeeInPaddingFieldsSlideOutPanelActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="seeInPaddingFieldsSlideOutPanel">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationAllOptionsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationAllOptionsActionGroup.xml
index ae137866631..faba94fbcb1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationAllOptionsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationAllOptionsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateAdvancedConfigurationAllOptionsActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotSetActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotSetActionGroup.xml
index 7858fc9abc7..2951258a1b0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotSetActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotSetActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotesActionGroup.xml
index 49d8375d053..6f4fc985680 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationNotesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAlignmentActionGroup.xml
index 9c44ef08ccb..79bc908e598 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup.xml
index 1e9d06730c8..cc6bfeafb38 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithAllUpdatedNotVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithBorderColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithBorderColorActionGroup.xml
index cc1d14852b2..a572430f9b2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithBorderColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithBorderColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithCssClassesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithCssClassesActionGroup.xml
index 5640bd7633d..952761bae1a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithCssClassesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithCssClassesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentActionGroup.xml
index ae3b0d1abfe..b3cbe3e0cc9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateAdvancedConfigurationWithNoAlignmentActionGroup" extends="ValidateAdvancedConfigurationAllOptionsActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentNotVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentNotVisibleActionGroup.xml
index 193b38a7a01..0e5dbec7169 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentNotVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoAlignmentNotVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderActionGroup.xml
index 5c78a4482ea..cc2c1d3de2b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderWidthActionGroup.xml
index 9d2648d7496..55840792c91 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoBorderWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoMarginsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoMarginsActionGroup.xml
index eaebcaf02d3..b12cfa8fa78 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoMarginsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoMarginsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoPaddingActionGroup.xml
index cbca2f551c2..3a7af2960d7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedConfigurationWithNoPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAlignmentActionGroup.xml
index 3e418f5844f..1f2ed0dc77b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedActionGroup.xml
index 6d50c936a8e..326e35314f1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedNotVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedNotVisibleActionGroup.xml
index 586f412f9d7..16ae613ce07 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedNotVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithAllUpdatedNotVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithBorderColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithBorderColorActionGroup.xml
index 12c47f1818c..dc1f102a76d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithBorderColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithBorderColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithCssClassesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithCssClassesActionGroup.xml
index 7d496c85919..9e58df0de73 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithCssClassesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithCssClassesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentActionGroup.xml
index 716c9ea5650..15c8d357107 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentEmptyBorderRadiusActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentEmptyBorderRadiusActionGroup.xml
index a7deead5e2d..1b385425f1c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentEmptyBorderRadiusActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentEmptyBorderRadiusActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentNotVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentNotVisibleActionGroup.xml
index 5aa80ee9789..f9cb035ea8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentNotVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoAlignmentNotVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderActionGroup.xml
index cfd8316cc4b..0f674af36ab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderRadiusActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderRadiusActionGroup.xml
index 06cc31b2c86..98bed25ab95 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderRadiusActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderRadiusActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderWidthActionGroup.xml
index 0def2dec370..e1d490e5e82 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoBorderWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoConfigurationActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoConfigurationActionGroup.xml
index 9fb33a67710..af1103a29d5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoConfigurationActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoConfigurationActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoMarginsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoMarginsActionGroup.xml
index 9863753b48f..6c278c2b3b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoMarginsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoMarginsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoPaddingActionGroup.xml
index 44a8d238858..b00cea77a10 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateAdvancedStyleWithNoPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsAndPaddingPlaceholderTextSlideOutPanelActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsAndPaddingPlaceholderTextSlideOutPanelActionGroup.xml
index 75ceedfb747..4a90dc8601b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsAndPaddingPlaceholderTextSlideOutPanelActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsAndPaddingPlaceholderTextSlideOutPanelActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsOrPaddingErrorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsOrPaddingErrorActionGroup.xml
index fbd34a0e052..5d382593db4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsOrPaddingErrorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateMarginsOrPaddingErrorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateNoBorderColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateNoBorderColorActionGroup.xml
index 774b75b2b66..86fef02729c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateNoBorderColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateNoBorderColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateNoBorderColorActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateTextAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateTextAlignmentActionGroup.xml
index 570d076020b..0e9b25b07bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateTextAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdvancedConfigurationActionGroup/ValidateTextAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateAllBackgroundAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateAllBackgroundAttributesActionGroup.xml
index c5983125e0f..db3754d8984 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateAllBackgroundAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateAllBackgroundAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateAllBackgroundAttributesActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesActionGroup.xml
index 9c674d969d7..146457b57d8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoColorActionGroup.xml
index 931fab64e29..af051a9fd7a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageActionGroup.xml
index 238204ccb7d..cde877541c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageOrColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageOrColorActionGroup.xml
index 6b21a6cc359..27f99c98cfa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageOrColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundAttributesWithNoImageOrColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageActionGroup.xml
index 2ceafa32aa4..e88394adb27 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateBackgroundConfigurationWithNoImageActionGroup" extends="ValidateAllBackgroundAttributesActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageOrColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageOrColorActionGroup.xml
index e2e21cf4f79..acb8ee17b4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageOrColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundConfigurationWithNoImageOrColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageActionGroup.xml
index 5b9d09296db..d52123d3df3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageConfigurationActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageConfigurationActionGroup.xml
index 3219db68fd0..18cf3f4fb3f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageConfigurationActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageConfigurationActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageContainerActionGroup.xml
index f5cce3ef1a4..3b22b546a37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundImageContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml
index 18efbb5b50d..b2faba56317 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -28,6 +28,6 @@
         </assertRegExp>
         <resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
         <waitForElementVisible selector="{{section.backgroundMobileImage(index, backgroundMobileImage.fileName)}}" stepKey="waitForBackgroundMobileImageVisible"/>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml
index 3f6fc75f473..7489bbcc51e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageAfterVideoFinishesPlayingInVideoBackgroundActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageInVideoBackgroundWithInvalidVideoActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageInVideoBackgroundWithInvalidVideoActionGroup.xml
index e8b15535bc8..2ef7b81fde4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageInVideoBackgroundWithInvalidVideoActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateFallbackImageInVideoBackgroundWithInvalidVideoActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateInvalidVideoBackgroundAndNoFallbackImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateInvalidVideoBackgroundAndNoFallbackImageActionGroup.xml
index b5b6884cb77..f4c3eb40b9c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateInvalidVideoBackgroundAndNoFallbackImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateInvalidVideoBackgroundAndNoFallbackImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesActionGroup.xml
index 2004d97182d..d2ed009bf3a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesWithNoImageOrColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesWithNoImageOrColorActionGroup.xml
index 4e42bae3abe..a694a757505 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesWithNoImageOrColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateMobileBackgroundAttributesWithNoImageOrColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateNoBackgroundImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateNoBackgroundImageActionGroup.xml
index 4d0ebe455a9..7e0b086c721 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateNoBackgroundImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateNoBackgroundImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml
index 55b5dfad843..b1680ad2e78 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateParallaxVideoBackgroundWithAllAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml
index ade58c9c897..3c21930ea2b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoAspectRatioActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingActionGroup.xml
index 600133d358a..11b0ffd0b1b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingBeforeViewingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingBeforeViewingActionGroup.xml
index 2fc3e6e511d..3fa217f7b3b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingBeforeViewingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundFinishedPlayingBeforeViewingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedActionGroup.xml
index 343129e9278..3cea86a4dbc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingActionGroup.xml
index f89a1f23e02..1b064f51adf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup.xml
new file mode 100644
index 00000000000..b6f1fafbdd9
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup" extends="validateVideoBackgroundPlaying">
+        <annotations>
+            <description>Validates that the video in the video background is loaded but not playing.</description>
+        </annotations>
+        <assertStringNotContainsString stepKey="assertVideoPlaying">
+            <expectedResult type="string">backface-visibility: visible;</expectedResult>
+            <actualResult type="variable">$videoStyle</actualResult>
+        </assertStringNotContainsString>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml
index 427a41d686a..315d1eca216 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundLoadedButNotPlayingForNotVisibleElementActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundNotLoadedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundNotLoadedActionGroup.xml
index 33a71ae162e..36029d4de83 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundNotLoadedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundNotLoadedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml
index 91abba109b6..5f111f727e6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundPlayingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -19,7 +19,7 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
-        <waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
+        <comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
         <grabAttributeFrom selector="{{section.videoBackgroundVideoElement(index)}}" userInput="style" stepKey="videoStyle"/>
         <assertStringContainsString stepKey="assertVideoPlaying">
             <expectedResult type="string">transform: translate3d(</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml
index 87c8fcbb847..d194fecf133 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithAllAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -32,7 +32,7 @@
         </assertEquals>
         <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
         <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
-        <waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
+        <comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
         <grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
         <assertStringContainsString stepKey="assertHeight">
             <expectedResult type="string">height: 100%;</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml
index 31bfcd7d2fe..722a7b856d5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateVideoBackgroundWithOnlyVideoUrlActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -28,8 +28,9 @@
             <actualResult type="variable">grabBackgroundColorValue</actualResult>
         </assertEquals>
         <wait time="5" stepKey="waitToPreventVideoFlakiness"/>
-        <waitForElementVisible selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
-        <waitForElement selector="{{section.videoBackgroundVideoUrl(index, videoUrl.renderedValue)}}" stepKey="waitForVideoUrl"/>
+	<scrollToTopOfPage stepKey="scrollToTopToAvoidFlakiness" />
+        <waitForElement selector="{{section.videoBackgroundVideoElement(index)}}" stepKey="waitForVideoVisible"/>
+        <comment userInput="BIC Change for PB Video: {{videoUrl.name}} is encrypted" stepKey="waitForVideoUrl"/>
         <grabAttributeFrom selector="{{section.videoBackgroundJarallaxContainer(index)}}" userInput="style" stepKey="jarallaxStyle"/>
         <assertStringContainsString stepKey="assertHeight">
             <expectedResult type="string">height: 100%;</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/ExpandAdminCategorySectionActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/ExpandAdminCategorySectionActionGroup.xml
index 6f08ea002d8..c9dd2f8e4bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/ExpandAdminCategorySectionActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/ExpandAdminCategorySectionActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/OpenPageBuilderForAttributeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/OpenPageBuilderForAttributeActionGroup.xml
index da15d95b10e..094697c8b36 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/OpenPageBuilderForAttributeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/OpenPageBuilderForAttributeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/SaveCatalogCategoryActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/SaveCatalogCategoryActionGroup.xml
index 13bf3dc47d2..a94f9d69880 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/SaveCatalogCategoryActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/CatalogProductActionGroup/SaveCatalogCategoryActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/SearchBlockInGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/SearchBlockInGridActionGroup.xml
index bba21eba2c0..2dd75c5e623 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/SearchBlockInGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/SearchBlockInGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyAlignmentRightInBlockActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyAlignmentRightInBlockActionGroup.xml
index 12af39be211..fd4987954f1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyAlignmentRightInBlockActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyAlignmentRightInBlockActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyBlockOnStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyBlockOnStageActionGroup.xml
index 9398cd9f315..a17c0085ba4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyBlockOnStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyBlockOnStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentBottomInBlockActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentBottomInBlockActionGroup.xml
index d053fb98b02..cf9bc51cfbe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentBottomInBlockActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentBottomInBlockActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml
index cc957a8999e..bc74d8169a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeBlockActionGroup/VerifyVerticalAlignmentCenterInBlockActionGroup.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="verifyVerticalAlignmentCenterInBlock">
-        <arguments>
-            <argument name="block" defaultValue="BlockOnStorefront"/>
-            <argument name="container"/>
-            <argument name="containerIndex" defaultValue="1" type="string"/>
-            <argument name="content"/>
-            <argument name="contentIndex" defaultValue="1" type="string"/>
-        </arguments>
-        <executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top" stepKey="containerCenter"/>
-        <executeJS function="return document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top" stepKey="contentCenter"/>
-        <assertEquals stepKey="assertBottomPosition">
-            <expectedResult type="variable">containerCenter</expectedResult>
-            <actualResult type="variable">contentCenter</actualResult>
-        </assertEquals>
-    </actionGroup>
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+  <actionGroup name="verifyVerticalAlignmentCenterInBlock">
+    <arguments>
+      <argument name="block" defaultValue="BlockOnStorefront"/>
+      <argument name="container"/>
+      <argument name="containerIndex" defaultValue="1" type="string"/>
+      <argument name="content"/>
+      <argument name="contentIndex" defaultValue="1" type="string"/>
+    </arguments>
+    <executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{container.baseCSS}}')[{{containerIndex}}-1].getBoundingClientRect().top)" stepKey="containerCenter"/>
+    <executeJS function="return Math.round(document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].clientHeight/2 + document.querySelectorAll('{{block.baseCSS}} {{content.baseCSS}}')[{{contentIndex}}-1].getBoundingClientRect().top)" stepKey="contentCenter"/>
+    <assertEquals stepKey="assertBottomPosition">
+      <expectedResult type="variable">containerCenter</expectedResult>
+      <actualResult type="variable">contentCenter</actualResult>
+    </assertEquals>
+  </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/InlineEditButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/InlineEditButtonActionGroup.xml
index 8c312711494..384d1b786ea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/InlineEditButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/InlineEditButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/MoveButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/MoveButtonActionGroup.xml
index a7b5e81ac25..9c85248bfcd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/MoveButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/MoveButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceActionGroup.xml
index f57e349b381..96b7c50eba9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceWrapsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceWrapsActionGroup.xml
index 3c26e401f70..0d3717ed5c4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceWrapsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupInlineAppearanceWrapsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupStackedAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupStackedAppearanceActionGroup.xml
index f3f40412d30..97b94fb44c6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupStackedAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonGroupStackedAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemContentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemContentActionGroup.xml
index f51fb1c8d99..08c8dcae16a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemContentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemContentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDefaultMarginActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDefaultMarginActionGroup.xml
index adc524243f2..7f23841d4a3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDefaultMarginActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDefaultMarginActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDifferentSizesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDifferentSizesActionGroup.xml
index af38466199c..f8228808bab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDifferentSizesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsDifferentSizesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsSameSizeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsSameSizeActionGroup.xml
index c349c412ba1..fb662e5d266 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsSameSizeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeButtonActionGroup/ValidateButtonItemsSameSizeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -15,6 +15,7 @@
             <argument name="firstButtonIndex" defaultValue="1" type="string"/>
             <argument name="secondButtonIndex" defaultValue="2" type="string"/>
         </arguments>
+        <waitForPageLoad stepKey="waitForPageLoadToAssert"/>
         <comment userInput="validateButtonItemsSameSize" stepKey="comment"/>
         <waitForElementVisible selector="{{buttonGroupPage.base(buttonGroupIndex)}}" stepKey="waitForButtonGroup"/>
         <seeElement selector="{{buttonGroupPage.sameSizeValue(buttonGroupIndex, PageBuilderButtonGroupSameSize_Enabled.value)}}" stepKey="seeButtonSameSizeValue"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/CloseGridSizeFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/CloseGridSizeFormActionGroup.xml
index f256d6b2cc4..52436afaa0a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/CloseGridSizeFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/CloseGridSizeFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToAnotherColumnGroupActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToAnotherColumnGroupActionGroup.xml
index 79355fc9c45..e9622df38c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToAnotherColumnGroupActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToAnotherColumnGroupActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToColumnGroupActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToColumnGroupActionGroup.xml
index 212e33d01d6..565fc071c96 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToColumnGroupActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToColumnGroupActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToExistingColumnLineActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToExistingColumnLineActionGroup.xml
new file mode 100644
index 00000000000..4c75fa0a203
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToExistingColumnLineActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="dragExistingColumnToExistingColumnLine">
+        <arguments>
+            <argument name="containerColumnGroupIndex" defaultValue="1" type="string"/>
+            <argument name="containerColumnLineIndex" defaultValue="1" type="string"/>
+            <argument name="columnIndexInNewLine" defaultValue="1" type="string"/>
+            <argument name="columnIndex" defaultValue="1" type="string"/>
+            <argument name="x" defaultValue="null" type="string"/>
+            <argument name="y" defaultValue="null" type="string"/>
+        </arguments>
+        <waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
+        <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" x="{{x}}" y="{{y}}" stepKey="onMouseOverContentTypeStage"/>
+        <waitForPageLoad time="30" stepKey="waitForMouseOverAnimation"/>
+        <waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex('column', columnIndex)}}" stepKey="waitForOptions"/>
+        <waitForElementVisible selector="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" stepKey="waitForMoveHandle"/>
+        <dragAndDrop selector1="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" selector2="{{PageBuilderStage.contentTypeInStageByIndex('column-group', containerColumnGroupIndex)}}{{PageBuilderStage.childContentTypeInStageByIndex('column-line', containerColumnLineIndex)}}{{PageBuilderStage.childContentTypeInStageByIndex('column', columnIndexInNewLine)}}" stepKey="moveContentTypeIntoContainer"/>
+        <waitForPageLoad stepKey="waitForDragOperation"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToNewColumnLineActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToNewColumnLineActionGroup.xml
new file mode 100644
index 00000000000..9120151e460
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragExistingColumnToNewColumnLineActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="dragExistingColumnToNewColumnLine">
+        <arguments>
+            <argument name="newColumnLineIndexExpected" defaultValue="1" type="string"/>
+            <argument name="targetColumnLineSelector" type="string"/>
+            <argument name="columnIndex" defaultValue="1" type="string"/>
+            <argument name="offsetXCoordinate" defaultValue="null" type="string"/>
+            <argument name="offsetYCoordinate" defaultValue="null" type="string"/>
+            <!-- When adding column line to the top, advised to use y offset of 10 -->
+        </arguments>
+        <waitForElementVisible time="20" selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" stepKey="waitForContentTypeInStageVisible"/>
+        <moveMouseOver selector="{{PageBuilderStage.contentTypeInStageByIndex('column', columnIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="onMouseOverContentTypeStage"/>
+        <waitForPageLoad time="30" stepKey="waitForMouseOverAnimation"/>
+        <waitForElementVisible time="10" selector="{{PageBuilderContentTypeOptionsMenu.contentTypeOptionsMenuByIndex('column', columnIndex)}}" stepKey="waitForOptions"/>
+        <waitForElementVisible selector="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" stepKey="waitForMoveHandle"/>
+        <dragAndDrop selector1="{{ColumnOnBackend.columnMoveByIndex(columnIndex)}}" selector2="{{targetColumnLineSelector}}"  x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropPageBuilderColumnGroupContentTypeIntoStage"/>
+        <waitForPageLoad stepKey="waitForAnimationasdads" time="30"/>
+        <dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
+        <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex('column-line', newColumnLineIndexExpected)}}" stepKey="waitForPageBuilderColumnLineContentTypeInStage"/>
+        <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragNewColumnToNewColumnLineActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragNewColumnToNewColumnLineActionGroup.xml
new file mode 100644
index 00000000000..003d912549a
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragNewColumnToNewColumnLineActionGroup.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="dragNewColumnToNewColumnLine">
+        <arguments>
+            <argument name="contentTypeIndex" defaultValue="1" type="string"/>
+            <argument name="targetColumnLineSelector" type="string"/>
+            <argument name="offsetXCoordinate" defaultValue="null" type="string"/>
+            <argument name="offsetYCoordinate" defaultValue="null" type="string"/>
+            <argument name="pageBuilderArea" defaultValue="" type="string"/>
+        </arguments>
+        <click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
+        <waitForElementVisible time="30" selector="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderColumnGroupContentType.name)}}" stepKey="waitForPageBuilderColumnGroupContentTypeInPanel"/>
+        <dragAndDrop selector1="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel(PageBuilderColumnGroupContentType.name)}}" selector2="{{targetColumnLineSelector}}"  x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropagainPageBuilderColumnGroupContentTypeIntoStage"/>
+        <waitForPageLoad stepKey="waitForAnimationasdads" time="30"/>
+        <dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
+        <waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex('column-line', contentTypeIndex)}}" stepKey="waitForPageBuilderColumnLineContentTypeInStage"/>
+        <waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/OpenGridSizeFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/OpenGridSizeFormActionGroup.xml
index bb47da42283..adabd4112d1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/OpenGridSizeFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/OpenGridSizeFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeActionGroup.xml
index fe7f7bc62ba..9d66195de8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="updateGridSize" deprecated="use updateGridSizeInForm instead">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeInvalidActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeInvalidActionGroup.xml
index aca78f8fe76..ae5155097c6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeInvalidActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/UpdateGridSizeInvalidActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceBottomAlignedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceBottomAlignedActionGroup.xml
index 489f93d1166..7ef700d169b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceBottomAlignedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceBottomAlignedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateColumnAppearanceBottomAligned" extends="validateColumnAppearanceTopAligned">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceCenterAlignedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceCenterAlignedActionGroup.xml
index b192858e5a8..9dc55462605 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceCenterAlignedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceCenterAlignedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceFullHeightActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceFullHeightActionGroup.xml
index a2d77906bcf..0ae56b5eb9d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceFullHeightActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceFullHeightActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceTopAlignedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceTopAlignedActionGroup.xml
index 982dda7287c..296d992a5d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceTopAlignedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnAppearanceTopAlignedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateColumnAppearanceTopAligned">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml
index 156b553d7e8..5e24cbf399b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateColumnWidthActionGroup">
@@ -20,7 +20,7 @@
         <executeJS function="return Math.round((window.getComputedStyle(document.evaluate('{{section.columnGroupPath(parentIndex)}}', document.body).iterateNext()).width.replace(/px/g, &quot;&quot;) - 30)* {{columnWidth}})" stepKey="grabCalculatedColumnWidthValue"/>
         <executeJS function="return Math.abs({$grabColumnWidthValue}-{$grabCalculatedColumnWidthValue})" stepKey="columnWidthDifference"/>
         <assertLessThanOrEqual stepKey="assertColumnWidthValue">
-            <expectedResult type="int">2</expectedResult>
+            <expectedResult type="int">3</expectedResult>
             <actualResult type="variable">columnWidthDifference</actualResult>
         </assertLessThanOrEqual>
     </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthOnFrontendActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthOnFrontendActionGroup.xml
index dc987e6ad9e..40fb528be15 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthOnFrontendActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/ValidateColumnWidthOnFrontendActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidateColumnWidthOnFrontendActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/OpenGridSizeFormInColumnGroupActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/OpenGridSizeFormInColumnGroupActionGroup.xml
index 3e6fd122c19..eb090751c28 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/OpenGridSizeFormInColumnGroupActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/OpenGridSizeFormInColumnGroupActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInFormActionGroup.xml
index 83ea345422c..b556deec705 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="updateGridSizeInForm">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidInFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidInFormActionGroup.xml
index 33b6f0394ec..c55741677b0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidInFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnGroupActionGroup/UpdateGridSizeInvalidInFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeContainerActionGroup/VerifyAffordanceSizeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeContainerActionGroup/VerifyAffordanceSizeActionGroup.xml
index aefc51132e9..e5356376b2c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeContainerActionGroup/VerifyAffordanceSizeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeContainerActionGroup/VerifyAffordanceSizeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="VerifyAffordanceSizeActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerActionGroup.xml
index 44c571f5fb5..17afee7bfaf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerGeneralAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerGeneralAttributesActionGroup.xml
index 7c156a601a8..eaf5c7e7f11 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerGeneralAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerGeneralAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWidthPercentageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWidthPercentageActionGroup.xml
index 47ec628bcc6..711bbce93fc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWidthPercentageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWidthPercentageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateDividerWidthPercentage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutColorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutColorActionGroup.xml
index 8a2c5140866..d0d3b93790b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutColorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutColorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutThicknessActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutThicknessActionGroup.xml
index 104aa50a7e2..f57301b224e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutThicknessActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutThicknessActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutWidthActionGroup.xml
index 2ae02cb2b62..5dcec5e5b35 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeDividerActionGroup/ValidateDividerWithoutWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickInsideLiveEditHeadingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickInsideLiveEditHeadingActionGroup.xml
index 5a4c03505a3..a00e35d9f1c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickInsideLiveEditHeadingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickInsideLiveEditHeadingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickOutsideLiveEditHeadingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickOutsideLiveEditHeadingActionGroup.xml
index 96185919e49..ca55a521d2e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickOutsideLiveEditHeadingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/ClickOutsideLiveEditHeadingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/EnterHeadingOnStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/EnterHeadingOnStageActionGroup.xml
index 1d4272c6980..dfad374538d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/EnterHeadingOnStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/EnterHeadingOnStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllOptionsUpdatedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllOptionsUpdatedActionGroup.xml
index 5fe80ddb2b6..82d742fffa8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllOptionsUpdatedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllOptionsUpdatedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllUpdatedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllUpdatedActionGroup.xml
index fcc0134e065..b15aaf0e00e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllUpdatedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingAdvancedConfigurationWithAllUpdatedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingBaseAdvancedConfigurationNotVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingBaseAdvancedConfigurationNotVisibleActionGroup.xml
index f53a2c73592..44c3dabbb4d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingBaseAdvancedConfigurationNotVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingBaseAdvancedConfigurationNotVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationActionGroup.xml
index c27d7da8ec9..afbdf306e7c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
-* Copyright © Magento, Inc. All rights reserved.
-* See COPYING.txt for license details.
-*/
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationNotVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationNotVisibleActionGroup.xml
index 56c14097490..5a629439f55 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationNotVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationNotVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationVisibleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationVisibleActionGroup.xml
index 9a4264e3054..68429ff7607 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationVisibleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingDefaultAdvancedConfigurationVisibleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageActionGroup.xml
index ec064a3e8ec..f856f70ccaa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageWithAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageWithAlignmentActionGroup.xml
index 97f5f43548d..5e4e4844807 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageWithAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStageWithAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontActionGroup.xml
index ec5a1148f68..ea42616b70f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontWithAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontWithAlignmentActionGroup.xml
index d6e99cd181f..f46780fe4b7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontWithAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHeadingActionGroup/VerifyHeadingInStorefrontWithAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license  details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddPageLinkWidgetToHtmlCodeWYSIWYGDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddPageLinkWidgetToHtmlCodeWYSIWYGDisabledActionGroup.xml
index 7e6c35813a1..1d1b3ef3a24 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddPageLinkWidgetToHtmlCodeWYSIWYGDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddPageLinkWidgetToHtmlCodeWYSIWYGDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddTextToHtmlCodeWYSIWYGActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddTextToHtmlCodeWYSIWYGActionGroup.xml
index d8e901f680c..158bfa500d1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddTextToHtmlCodeWYSIWYGActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddTextToHtmlCodeWYSIWYGActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddVariableToHtmlCodeWYSIWYGDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddVariableToHtmlCodeWYSIWYGDisabledActionGroup.xml
index c8f1dcd5ee8..72c436053c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddVariableToHtmlCodeWYSIWYGDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/AddVariableToHtmlCodeWYSIWYGDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/ClickHtmlInsertImageButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/ClickHtmlInsertImageButtonActionGroup.xml
index 49f00fffe64..cdf3e487a81 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/ClickHtmlInsertImageButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/ClickHtmlInsertImageButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/RemoveTextFromHtmlCodeWYSIWYGActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/RemoveTextFromHtmlCodeWYSIWYGActionGroup.xml
index c81d6edb91f..1879fac2e54 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/RemoveTextFromHtmlCodeWYSIWYGActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeHtmlActionGroup/RemoveTextFromHtmlCodeWYSIWYGActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AddImageToStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AddImageToStageActionGroup.xml
index 2ce15cbf834..fcdba3bcef7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AddImageToStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AddImageToStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -12,7 +12,7 @@
             <argument name="property"/>
         </arguments>
         <comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttach"/>
-        <attachFile userInput="{{property.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
+        <attachFile userInput="{{property.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtnWithUploaderId}}" stepKey="attachImageFileOnStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
         <waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSource(property.fileName)}}" stepKey="waitForImageSource"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminAddImageCMSBlockActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminAddImageCMSBlockActionGroup.xml
index 4e4c9658874..e59123b1504 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminAddImageCMSBlockActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminAddImageCMSBlockActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminOpenSelectImageFromGalleryActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminOpenSelectImageFromGalleryActionGroup.xml
index 4de0b2b9eb1..20a311fbb23 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminOpenSelectImageFromGalleryActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminOpenSelectImageFromGalleryActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageActionGroup.xml
index c56f1ed3837..c657267d610 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationActionGroup.xml
index 91519f5172e..dafd1b053e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationWithNoAlignmentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationWithNoAlignmentActionGroup.xml
index f7e44007dde..4907ad1e08f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationWithNoAlignmentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/ValidateImageAdvancedConfigurationWithNoAlignmentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/VerifyImageOnSlideoutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/VerifyImageOnSlideoutActionGroup.xml
index b969a7dfdd5..39193807d4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/VerifyImageOnSlideoutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/VerifyImageOnSlideoutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickAddLocationButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickAddLocationButtonActionGroup.xml
index cc18b123b89..7947d3e786e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickAddLocationButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickAddLocationButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickEditButtonOnLocationGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickEditButtonOnLocationGridActionGroup.xml
index 5a20fd44c70..4e429d7b730 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickEditButtonOnLocationGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickEditButtonOnLocationGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickLocationGridRowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickLocationGridRowActionGroup.xml
index 8a1ebdc6498..6f6f5c7f58b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickLocationGridRowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickLocationGridRowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickMapToAddOrMovePinActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickMapToAddOrMovePinActionGroup.xml
index 7658ec11036..0e7040b20d7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickMapToAddOrMovePinActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ClickMapToAddOrMovePinActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseLocationFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseLocationFormActionGroup.xml
index 3cad0b8866f..5e472de9188 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseLocationFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseLocationFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseMapPinTooltipWindowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseMapPinTooltipWindowActionGroup.xml
index 42699cf0f77..5cf12e54cdf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseMapPinTooltipWindowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/CloseMapPinTooltipWindowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DeleteLocationFromGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DeleteLocationFromGridActionGroup.xml
index 059a6e4b1a4..840aede016f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DeleteLocationFromGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DeleteLocationFromGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DontSeeMapPinActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DontSeeMapPinActionGroup.xml
index 0a828cd0bc7..40ffaad0f63 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DontSeeMapPinActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/DontSeeMapPinActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/MoveMapPinByDraggingAndDroppingPinActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/MoveMapPinByDraggingAndDroppingPinActionGroup.xml
index 51210068a50..2bed5614a61 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/MoveMapPinByDraggingAndDroppingPinActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/MoveMapPinByDraggingAndDroppingPinActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/OpenMapPinTooltipWindowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/OpenMapPinTooltipWindowActionGroup.xml
index d6d5301e3d1..b264fdea430 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/OpenMapPinTooltipWindowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/OpenMapPinTooltipWindowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/SaveLocationFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/SaveLocationFormActionGroup.xml
index 55c05d37628..0b2cbfdc168 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/SaveLocationFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/SaveLocationFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithAllUpdatedMapWithErrorOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithAllUpdatedMapWithErrorOverlayActionGroup.xml
index 98708fe2931..a75bbdce43b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithAllUpdatedMapWithErrorOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithAllUpdatedMapWithErrorOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithNoAlignmentMapWithErrorOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithNoAlignmentMapWithErrorOverlayActionGroup.xml
index 70afc28c00e..4b6345bfd14 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithNoAlignmentMapWithErrorOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedConfigurationWithNoAlignmentMapWithErrorOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithAllUpdatedMapWithErrorOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithAllUpdatedMapWithErrorOverlayActionGroup.xml
index badbdffd7f7..1b80af31f79 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithAllUpdatedMapWithErrorOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithAllUpdatedMapWithErrorOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithNoAlignmentMapWithErrorOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithNoAlignmentMapWithErrorOverlayActionGroup.xml
index 3ac78ae8485..6aea06a2f1a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithNoAlignmentMapWithErrorOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateAdvancedStyleWithNoAlignmentMapWithErrorOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateEmptyMapStoreFrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateEmptyMapStoreFrontActionGroup.xml
index 45ebf1a4734..fd534268289 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateEmptyMapStoreFrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateEmptyMapStoreFrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateLocationGridDataActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateLocationGridDataActionGroup.xml
index d521994c82b..8e0362184f4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateLocationGridDataActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateLocationGridDataActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapButtonsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapButtonsActionGroup.xml
index 556af317dc0..1b76cd1d64a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapButtonsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapButtonsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageAddLocationFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageAddLocationFormActionGroup.xml
index 1784c40c7a7..f461b976284 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageAddLocationFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageAddLocationFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStageActionGroup.xml
index 0570801bcae..3765992bc9e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStorefrontActionGroup.xml
index e690fa64b75..7ba64398040 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapErrorMessageStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationActionGroup.xml
index b02fd9d1157..31350c13730 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationWithErrorOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationWithErrorOverlayActionGroup.xml
index 47632bc9d84..06b706d53e2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationWithErrorOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapGeneralConfigurationWithErrorOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHeightActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHeightActionGroup.xml
index fe90cfc9ae5..08bd26fea3f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHeightActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHeightActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHelperTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHelperTextActionGroup.xml
index 98f95585600..4f5476f8c37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHelperTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapHelperTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapPinLocationDataActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapPinLocationDataActionGroup.xml
index 683b1883145..5ff7c056bb0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapPinLocationDataActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapPinLocationDataActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsActionGroup.xml
index 8b19060c42e..9a592d462fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsWithErrorOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsWithErrorOverlayActionGroup.xml
index 01b8434f78d..3e00a09706b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsWithErrorOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateMapSettingsWithErrorOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoMapButtonsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoMapButtonsActionGroup.xml
index 781864a19f9..c2d52a84b4e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoMapButtonsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoMapButtonsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoPinTooltipActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoPinTooltipActionGroup.xml
index 080c36b9e90..39db78a6eba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoPinTooltipActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateNoPinTooltipActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateWarningMessageLinkActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateWarningMessageLinkActionGroup.xml
index 0472a490e74..b229dfefe61 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateWarningMessageLinkActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/ValidateWarningMessageLinkActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyCoordinatesNotEqualActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyCoordinatesNotEqualActionGroup.xml
index cab102458b1..e6816f67e69 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyCoordinatesNotEqualActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyCoordinatesNotEqualActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapHasPinActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapHasPinActionGroup.xml
index 917fad0e1e5..8621a49b482 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapHasPinActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapHasPinActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeActionGroup.xml
index 94c1d2f4d43..d94e5de5de1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeAlternateActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeAlternateActionGroup.xml
index f8576be2eb5..b09ebbe25e1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeAlternateActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyMapLatitudeAndLongitudeAlternateActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapActionGroup.xml
index beef1c5c533..e02de749eca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapNoClickActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapNoClickActionGroup.xml
index 6895e042ed9..7e0f5e9298e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapNoClickActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyNumberOfPinsOnMapNoClickActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationEqualActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationEqualActionGroup.xml
index bc644d8caf9..c1852807c92 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationEqualActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationEqualActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationNotEqualActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationNotEqualActionGroup.xml
index c7c5959bf53..33af4bff672 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationNotEqualActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup/VerifyPinLocationNotEqualActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionToProductConditionsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionToProductConditionsActionGroup.xml
index becf8f305f1..60e95020941 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionToProductConditionsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionToProductConditionsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsActionGroup.xml
index 9aa04dee9e8..b0e7936fa54 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsAndSetAggregateParametersActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsAndSetAggregateParametersActionGroup.xml
index de5ffa3631a..2d5ef2dd7b2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsAndSetAggregateParametersActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddConditionsCombinationToProductsAndSetAggregateParametersActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddSKUsToSelectProductsBySKUActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddSKUsToSelectProductsBySKUActionGroup.xml
index 37382b7f459..c34ff4b6d40 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddSKUsToSelectProductsBySKUActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AddSKUsToSelectProductsBySKUActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AssertValueInConditionsFilterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AssertValueInConditionsFilterActionGroup.xml
index ea77e0ef1ed..7a6914489e9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AssertValueInConditionsFilterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/AssertValueInConditionsFilterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInContinuousProductsCarouselOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInContinuousProductsCarouselOnStorefrontActionGroup.xml
index 7151e6585ab..af43b9d8cfd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInContinuousProductsCarouselOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInContinuousProductsCarouselOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInProductsOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInProductsOnStorefrontActionGroup.xml
index ba4fc4c8463..8bd12697a4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInProductsOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCartInProductsOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInContinuousProductsCarouselOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInContinuousProductsCarouselOnStorefrontActionGroup.xml
index 070685e52b9..2ba900b0e8c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInContinuousProductsCarouselOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInContinuousProductsCarouselOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInProductsOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInProductsOnStorefrontActionGroup.xml
index 0046dd95369..145811fa812 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInProductsOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToCompareInProductsOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInContinuousProductsCarouselOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInContinuousProductsCarouselOnStorefrontActionGroup.xml
index 790f799a093..d163a03ad60 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInContinuousProductsCarouselOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInContinuousProductsCarouselOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInProductsOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInProductsOnStorefrontActionGroup.xml
index b1cbda96966..236350c1786 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInProductsOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductAddToWishListInProductsOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNavigationDotActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNavigationDotActionGroup.xml
index 6b6e14157f3..ecf74468229 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNavigationDotActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNavigationDotActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNextNavigationArrowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNextNavigationArrowActionGroup.xml
index 750b83eaef6..53ea705eaf1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNextNavigationArrowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselNextNavigationArrowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselPreviousNavigationArrowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselPreviousNavigationArrowActionGroup.xml
index 197ac4455e2..b7a59f936a3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselPreviousNavigationArrowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductCarouselPreviousNavigationArrowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInContinuousProductsCarouselOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInContinuousProductsCarouselOnStorefrontActionGroup.xml
index 5d319c453d4..0560cbf3d49 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInContinuousProductsCarouselOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInContinuousProductsCarouselOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInProductsOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInProductsOnStorefrontActionGroup.xml
index f8b29c0c0da..cbe36515b8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInProductsOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductImageInProductsOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInContinuousProductsCarouselOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInContinuousProductsCarouselOnStorefrontActionGroup.xml
index 8484eeffa5a..2eb02a04b2a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInContinuousProductsCarouselOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInContinuousProductsCarouselOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInProductsOnStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInProductsOnStorefrontActionGroup.xml
index 0e5fa3ef812..a6e1a8845f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInProductsOnStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ClickProductNameInProductsOnStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/DragProductToSlideProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/DragProductToSlideProductCarouselActionGroup.xml
index 307f007b35f..d90186cd1c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/DragProductToSlideProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/DragProductToSlideProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeCategoriesInCategorySelectorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeCategoriesInCategorySelectorActionGroup.xml
index 2d947a30d48..d0e3e6e9a4c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeCategoriesInCategorySelectorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeCategoriesInCategorySelectorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeSKUsInSKUInputFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeSKUsInSKUInputFieldActionGroup.xml
index 7154042edd4..c10d3b9f75f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeSKUsInSKUInputFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SeeSKUsInSKUInputFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SelectCategoryFromCategoryDropDownActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SelectCategoryFromCategoryDropDownActionGroup.xml
index 20b88391614..dec4b95ff7d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SelectCategoryFromCategoryDropDownActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/SelectCategoryFromCategoryDropDownActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/StorefrontClickProductAddToCartValidateAsyncActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/StorefrontClickProductAddToCartValidateAsyncActionGroup.xml
new file mode 100644
index 00000000000..1bc3e0cc95c
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/StorefrontClickProductAddToCartValidateAsyncActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontClickProductAddToCartValidateAsyncActionGroup">
+        <arguments>
+            <argument name="product" type="string"/>
+        </arguments>
+        <waitForElementVisible selector="{{ProductsOnStorefront.productImageByProductName(product)}}" stepKey="waitForProductImage"/>
+        <moveMouseOver selector="{{ProductsOnStorefront.productImageByProductName(product)}}" stepKey="moveMouseOverProduct"/>
+        <click selector="{{ProductsOnStorefront.productAddToCartByProductName(product)}}" stepKey="clickProductAddToCart"/>
+        <seeElement selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAddingOrAdded}}" stepKey="seeAddingButtonLabel"/>
+        <waitForElementVisible selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="waitForAddedButtonLabel"/>
+        <seeElement selector="{{StorefrontProductActionSection.addToCartButtonTitleIsAdded}}" stepKey="seeAddedButtonLabel"/>
+        <waitForPageLoad stepKey="waitForProductPageToLoad"/>
+        <waitForText userInput="You added {{product}} to your shopping cart." stepKey="seeAddToCartSuccessMessage"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInContinuousProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInContinuousProductCarouselActionGroup.xml
index 5788e273346..1eddc2a9956 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInContinuousProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInContinuousProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInDefaultProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInDefaultProductCarouselActionGroup.xml
index 32ac2599025..794e5ccff70 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInDefaultProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCanSeeProductInDefaultProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInContinuousProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInContinuousProductCarouselActionGroup.xml
index dc7e8dc2cdb..85cc5cb9c95 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInContinuousProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInContinuousProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInDefaultProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInDefaultProductCarouselActionGroup.xml
index 92ff3f88ef4..5eb3da9e6e9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInDefaultProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateCannotSeeProductInDefaultProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateEmptyProductsContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateEmptyProductsContainerActionGroup.xml
index c80fcbc405e..608272098b6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateEmptyProductsContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateEmptyProductsContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsAreNotRenderedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsAreNotRenderedActionGroup.xml
index a085ed2469d..e38d880a5e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsAreNotRenderedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsAreNotRenderedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsWorkWithInfiniteLoopActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsWorkWithInfiniteLoopActionGroup.xml
index cf314fa4ec4..b3968301cfd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsWorkWithInfiniteLoopActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationArrowsWorkWithInfiniteLoopActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsActionGroup.xml
index 6ba941f3ee0..cd63e8ef030 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsAreNotRenderedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsAreNotRenderedActionGroup.xml
index 32b4225621c..7878a022c0a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsAreNotRenderedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNavigationDotsAreNotRenderedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowDisabledActionGroup.xml
index c22f2f3b71d..4619027e59a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowEnabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowEnabledActionGroup.xml
index 17f95569f8d..5e48bf9ecaa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowEnabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselNextNavigationArrowEnabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowDisabledActionGroup.xml
index 920f539ea63..b864c3506b6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowEnabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowEnabledActionGroup.xml
index d1de31df5a1..776dcdc7d33 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowEnabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselPreviousNavigationArrowEnabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselSettingsAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselSettingsAttributesActionGroup.xml
index b7c02f79a45..e6fff1c808c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselSettingsAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCarouselSettingsAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsActionGroup.xml
index 98f18170d51..938ddf524d5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsCarouselActionGroup.xml
index 5aa53ca663f..5861f1a49c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductCountInProductsCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductInProductsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductInProductsActionGroup.xml
index 459712172e5..728b35580fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductInProductsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductInProductsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInContinuousProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInContinuousProductCarouselActionGroup.xml
index 968b0d0bdfe..61149100ca6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInContinuousProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInContinuousProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInDefaultProductCarouselActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInDefaultProductCarouselActionGroup.xml
index 3e5e02c80b9..16bfc4af8d3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInDefaultProductCarouselActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductOpacityInDefaultProductCarouselActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductTotalsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductTotalsActionGroup.xml
index 4c147fc328e..51b7ca741bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductTotalsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductTotalsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsDoNotWrapInCarouselAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsDoNotWrapInCarouselAppearanceActionGroup.xml
index c1736cd06eb..b08c10604af 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsDoNotWrapInCarouselAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsDoNotWrapInCarouselAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForEvenNumberOfProductsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForEvenNumberOfProductsActionGroup.xml
index 6d7d45695f5..142687aceea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForEvenNumberOfProductsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForEvenNumberOfProductsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForOddNumberOfProductsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForOddNumberOfProductsActionGroup.xml
index 3a7fae68aec..c140da48973 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForOddNumberOfProductsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsInProductCarouselAreCenteredForOddNumberOfProductsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsWrapInGridAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsWrapInGridAppearanceActionGroup.xml
index 688347394b2..38c9a128d08 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsWrapInGridAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateProductsWrapInGridAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateSwatchInProductsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateSwatchInProductsActionGroup.xml
index a93a6f5c5aa..d4b4fc335a1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateSwatchInProductsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup/ValidateSwatchInProductsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateBackgroundImageContainerForParallaxRowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateBackgroundImageContainerForParallaxRowActionGroup.xml
index 28a9ec588e4..e76be5b0d35 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateBackgroundImageContainerForParallaxRowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateBackgroundImageContainerForParallaxRowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateContainedRowAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateContainedRowAppearanceActionGroup.xml
index 97d16a3b523..e0eb0435854 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateContainedRowAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateContainedRowAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -14,7 +14,7 @@
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
         <comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
-        <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
+        <resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
         <executeJS function="return {{pageOrStageWidthJS}}" stepKey="pageOrStageWidth"/>
         <executeJS function="return {{section.rowWidthJS(index)}}" stepKey="rowWidth"/>
         <assertGreaterThan stepKey="assertRowWidthGreaterThanZero">
@@ -25,6 +25,6 @@
             <expectedResult type="variable">pageOrStageWidth</expectedResult>
             <actualResult type="variable">rowWidth</actualResult>
         </assertLessThan>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullBleedRowAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullBleedRowAppearanceActionGroup.xml
index c8591215f67..f59e667bdfc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullBleedRowAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullBleedRowAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml
index 717cb455707..e9f7eb5e0ce 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -20,7 +20,7 @@
             <argument name="affordanceValue" defaultValue="0" type="string"/>
         </arguments>
         <comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
-        <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
+        <resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
         <executeJS function="return {{pageOrStageWidthJS}} - {{affordanceValue}}" stepKey="pageOrStageWidth"/>
         <executeJS function="return {{section.rowWidthJS(rowIndex)}}" stepKey="rowWidth"/>
         <executeJS function="return parseInt({{section.rowChildContentWidthJS(rowIndex, childContentType.role, childContentTypeIndex)}} + {{padding.paddingLeft}} + {{padding.paddingRight}} + ({{childContentTypeBorder.value}}*2))" stepKey="rowChildElementWidth"/>
@@ -41,6 +41,6 @@
             <expectedResult type="int">1300</expectedResult>
             <actualResult type="variable">rowChildElementWidth</actualResult>
         </assertLessThanOrEqual>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabledActionGroup.xml
index 0cc22c98dc4..43f800692c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundConfigurationWithAllUpdatedAndParallaxEnabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundConfigurationWithAllUpdatedAndParallaxEnabledActionGroup.xml
index 1a61aaea760..96342979ced 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundConfigurationWithAllUpdatedAndParallaxEnabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowBackgroundConfigurationWithAllUpdatedAndParallaxEnabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowParallaxBackgroundAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowParallaxBackgroundAttributesActionGroup.xml
index 3b1f87a2987..eea5ce723bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowParallaxBackgroundAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateRowParallaxBackgroundAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditSlideOrBannerButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditSlideOrBannerButtonActionGroup.xml
index b8508e7b10c..609e6633976 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditSlideOrBannerButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditSlideOrBannerButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditWYSIWYGFromStageForSlideCollageAppearancesInSmallColumnsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditWYSIWYGFromStageForSlideCollageAppearancesInSmallColumnsActionGroup.xml
index f42da2507ea..54dfca12d7e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditWYSIWYGFromStageForSlideCollageAppearancesInSmallColumnsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/InlineEditWYSIWYGFromStageForSlideCollageAppearancesInSmallColumnsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/NextSlideActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/NextSlideActionGroup.xml
index 94211045d41..8823613eb68 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/NextSlideActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/NextSlideActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="nextSlide">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/SwitchSlideActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/SwitchSlideActionGroup.xml
index e9bfcee9e1d..f7dcba4814f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/SwitchSlideActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/SwitchSlideActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesForSlideActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesForSlideActionGroup.xml
index 0002c8342bc..b19506971ac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesForSlideActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesForSlideActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesWithNoImageForSlideActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesWithNoImageForSlideActionGroup.xml
index 3a6f6818ce7..b725b8ec2c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesWithNoImageForSlideActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateBackgroundAttributesWithNoImageForSlideActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateBackgroundAttributesWithNoImageForSlide" extends="validateBackgroundAttributesWithNoImage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateSliderAttributesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateSliderAttributesActionGroup.xml
index e86df45f837..8ca800d4b40 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateSliderAttributesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeSliderActionGroup/ValidateSliderAttributesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateSliderAttributesActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/InlineEditTabItemNameActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/InlineEditTabItemNameActionGroup.xml
index 91613eac50b..f453cc8f9b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/InlineEditTabItemNameActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/InlineEditTabItemNameActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/MoveTabItemActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/MoveTabItemActionGroup.xml
index 02c6fa1e0ca..e349bf16494 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/MoveTabItemActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/MoveTabItemActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/SwitchTabsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/SwitchTabsActionGroup.xml
index 7c6aaa25270..e658bfadb09 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/SwitchTabsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/SwitchTabsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabContentAdvancedConfigurationAllOptionsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabContentAdvancedConfigurationAllOptionsActionGroup.xml
index 9b0d09ef8b9..9a55dbefc8f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabContentAdvancedConfigurationAllOptionsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabContentAdvancedConfigurationAllOptionsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabHeadersAlignedCenterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabHeadersAlignedCenterActionGroup.xml
index e3d293d5522..63293ff67fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabHeadersAlignedCenterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTabsActionGroup/ValidateTabHeadersAlignedCenterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateEmptyVideoStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateEmptyVideoStageActionGroup.xml
index 6620d991a8a..f86bca726d4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateEmptyVideoStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateEmptyVideoStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup.xml
new file mode 100644
index 00000000000..556905ce409
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup">
+        <executeJS function="return document.querySelectorAll('{{VideoOnStorefront.mainCSS}} {{VideoOnStorefront.videoWithPlaysinline}}').length" stepKey="playsinlineAttributesCount"/>
+        <assertEquals stepKey="assertPlaysinlineAttributePresent">
+            <expectedResult type="string">1</expectedResult>
+            <actualResult type="variable">playsinlineAttributesCount</actualResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoActionGroup.xml
index f6553488f6f..2a9f5e40978 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoAdvancedConfigurationAllOptionsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoAdvancedConfigurationAllOptionsActionGroup.xml
index 0c673589eb6..598360c078a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoAdvancedConfigurationAllOptionsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoAdvancedConfigurationAllOptionsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoEmptyWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoEmptyWidthActionGroup.xml
index 0ae4db62af4..aa26e5a96f0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoEmptyWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoEmptyWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoNotAutoplayingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoNotAutoplayingActionGroup.xml
index 9da451f6d0a..f89bc51b637 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoNotAutoplayingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoNotAutoplayingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -11,6 +11,6 @@
         <annotations>
             <description>Validates that the video content type is not autoplaying.</description>
         </annotations>
-        <waitForElementVisible selector="{{page.iframeNotAutoplaying(index)}}" stepKey="seeIframePlaying"/>
+        <waitForElementVisible selector="{{page.videoNotAutoplay(index)}}" stepKey="seeIframePlaying"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml
index 6b2b315ce9d..be7c0c24503 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoPlayingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -17,9 +17,9 @@
         </arguments>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{page.videoElement(index)}}" stepKey="waitForVideoVisible"/>
-        <executeJS function="document.querySelector('[data-element=\'video\']').id = 'video-iframe'" stepKey="setIframeId"/>
-        <switchToIFrame userInput="video-iframe" stepKey="switchToVideoIframe"/>
-        <waitForElementVisible selector="{{page.iframePlaying(index)}}" stepKey="seeIframePlaying"/>
-        <switchToIFrame stepKey="switchBackFromIframe"/>
+        <comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="setIframeId"/>
+        <comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="switchToVideoIframe"/>
+        <waitForElementVisible selector="{{page.videoAutoplay(index)}}" stepKey="seeIframePlaying"/>
+        <comment userInput="BIC Change for PB Video: Iframe not available as video URL is changed" stepKey="switchBackFromIframe"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlActionGroup.xml
index f79ec60581d..2c96a490d07 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlMp4ActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlMp4ActionGroup.xml
index c9d1a8237f6..ceae0ef42ca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlMp4ActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeVideoActionGroup/ValidateVideoWithOnlyVideoUrlMp4ActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotDragContentTypeToTargetActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotDragContentTypeToTargetActionGroup.xml
index 8a3ebfcc4d3..20bc6b16b4d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotDragContentTypeToTargetActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotDragContentTypeToTargetActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotMoveContentTypeToContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotMoveContentTypeToContainerActionGroup.xml
index 44e02700ca6..a560f00d2ef 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotMoveContentTypeToContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/CannotMoveContentTypeToContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragColumnGroupToExistingColumnGroupActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragColumnGroupToExistingColumnGroupActionGroup.xml
index eafdaef6bfc..50cc3f0f10f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragColumnGroupToExistingColumnGroupActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragColumnGroupToExistingColumnGroupActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeNextToExistingContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeNextToExistingContentTypeActionGroup.xml
index bd6d4f17bd4..75425dc29ad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeNextToExistingContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeNextToExistingContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContainerActionGroup.xml
index 2ca55c0561d..aa3bd023514 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContentTypeActionGroup.xml
index f76a2ec1b54..fd2a1e3f8d7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToDropZoneActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToDropZoneActionGroup.xml
index c8a5e7de40f..cfdd02a5967 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToDropZoneActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToDropZoneActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToHiddenContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToHiddenContainerActionGroup.xml
index 25fc2353f41..17e1f675a8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToHiddenContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToHiddenContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageActionGroup.xml
index b3fd10ff2c3..e3a0a2f3f41 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageByIndexActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageByIndexActionGroup.xml
index b01757f1976..0edd510d525 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageByIndexActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/DragContentTypeToStageByIndexActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/MoveContentTypeToContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/MoveContentTypeToContainerActionGroup.xml
index d65995e8e73..2e0f2a4b123 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/MoveContentTypeToContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/DragAndDropActionGroup/MoveContentTypeToContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/AssertFieldSlideOutPropertyValueEqualsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/AssertFieldSlideOutPropertyValueEqualsActionGroup.xml
new file mode 100644
index 00000000000..54e5c0062db
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/AssertFieldSlideOutPropertyValueEqualsActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="assertFieldSlideOutPropertyValueEquals">
+        <arguments>
+            <argument name="property"/>
+            <argument name="value" defaultValue="" type="string"/>
+        </arguments>
+        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
+        <see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
+        <grabValueFrom selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="getFieldValue"/>
+        <assertEquals stepKey="assertFieldValueEquals">
+            <actualResult type="variable">getFieldValue</actualResult>
+            <expectedResult type="string">{{value}}</expectedResult>
+        </assertEquals>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ChooseVisualSelectOptionActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ChooseVisualSelectOptionActionGroup.xml
index 5c254cde247..17c9cc470db 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ChooseVisualSelectOptionActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ChooseVisualSelectOptionActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClearSlideOutPanelFieldGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClearSlideOutPanelFieldGeneralActionGroup.xml
index 56196af21e2..65f8200317e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClearSlideOutPanelFieldGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClearSlideOutPanelFieldGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldGeneralActionGroup.xml
index 5e0e944f952..3549d528544 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldOpenInNewTabActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldOpenInNewTabActionGroup.xml
index b1fca077d54..940d0c78b70 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldOpenInNewTabActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ClickSlideOutPanelFieldOpenInNewTabActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/CloseEditPanelSettingsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/CloseEditPanelSettingsActionGroup.xml
index a20a825889b..6995ab6b236 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/CloseEditPanelSettingsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/CloseEditPanelSettingsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ConditionalClickSlideOutPanelFieldGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ConditionalClickSlideOutPanelFieldGeneralActionGroup.xml
index 7a776430d43..c66a8e45c0e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ConditionalClickSlideOutPanelFieldGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ConditionalClickSlideOutPanelFieldGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ExpandConfigurationSectionActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ExpandConfigurationSectionActionGroup.xml
index ee0aa59271d..6e7c4a35c30 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ExpandConfigurationSectionActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ExpandConfigurationSectionActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillOutUrlInputActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillOutUrlInputActionGroup.xml
index c4666c8ab7a..b9821dc4327 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillOutUrlInputActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillOutUrlInputActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldActionGroup.xml
index f48227fb98a..e791e05953f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetActionGroup.xml
index f82ca55d49f..a313ab7094a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneralActionGroup.xml
index cb88c05ec09..985907df54b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldGeneralActionGroup.xml
index 0af3a8618f7..82c3414f02d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelFieldGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelLinkUrlFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelLinkUrlFieldActionGroup.xml
index e78be1c13fc..09ff06203c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelLinkUrlFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelLinkUrlFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelMultiSelectFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelMultiSelectFieldActionGroup.xml
index 8a5772201ab..6fedfeb3235 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelMultiSelectFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelMultiSelectFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelTextAreaActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelTextAreaActionGroup.xml
index fa995201a83..b2fc19cd456 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelTextAreaActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/FillSlideOutPanelTextAreaActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorActionGroup.xml
index 3f433a73f70..4888de7710c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorGeneralSectionActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorGeneralSectionActionGroup.xml
index 71e91c6322a..030feb6753f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorGeneralSectionActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelAndValidateFieldErrorGeneralSectionActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsActionGroup.xml
index 730c2a78af4..72cb7aa23cc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsFullScreenActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsFullScreenActionGroup.xml
index 7ebeb96ab84..fec0aa5a0b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsFullScreenActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SaveEditPanelSettingsFullScreenActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ScrollToSlideOutPanelFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ScrollToSlideOutPanelFieldActionGroup.xml
index e7bf2999df4..70f032c5398 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ScrollToSlideOutPanelFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ScrollToSlideOutPanelFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutIsZeroPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutIsZeroPropertyActionGroup.xml
index 5aac87d32b2..71a305d092f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutIsZeroPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutIsZeroPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyActionGroup.xml
index f666c40ddb8..c0ca7977faf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyAlternateActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyAlternateActionGroup.xml
index 4b37f30ec95..e8bacf6c943 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyAlternateActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldSlideOutPropertyAlternateActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldWithoutLabelSlideOutPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldWithoutLabelSlideOutPropertyActionGroup.xml
index 3c8cc044a66..fbf312f35df 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldWithoutLabelSlideOutPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInFieldWithoutLabelSlideOutPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInSlideOutMultiSelectFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInSlideOutMultiSelectFieldActionGroup.xml
index 10ed72e9ce5..04c9ce20ca0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInSlideOutMultiSelectFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeInSlideOutMultiSelectFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsCheckedSlideOutPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsCheckedSlideOutPropertyActionGroup.xml
index c2cdb3cb03b..f0b18d51fb7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsCheckedSlideOutPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsCheckedSlideOutPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsNotCheckedSlideOutPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsNotCheckedSlideOutPropertyActionGroup.xml
index c3ce5b51c7a..9d4f25cb672 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsNotCheckedSlideOutPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsNotCheckedSlideOutPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsSelectedSlideOutPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsSelectedSlideOutPropertyActionGroup.xml
index ac5049be59b..d71c649ad64 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsSelectedSlideOutPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeOptionIsSelectedSlideOutPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldNotOpenInNewTabActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldNotOpenInNewTabActionGroup.xml
index 3301e300b68..fc91f283d67 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldNotOpenInNewTabActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldNotOpenInNewTabActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldOpenInNewTabActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldOpenInNewTabActionGroup.xml
index f963cf5fc2f..e1d431a65bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldOpenInNewTabActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SeeSlideOutPanelFieldOpenInNewTabActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldActionGroup.xml
index 8543f8e0477..3286ff6a285 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldGeneralActionGroup.xml
index 1055fab8e60..b26a8fc0918 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/SelectSlideOutPanelFieldGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateAlignmentFieldIsNotDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateAlignmentFieldIsNotDisabledActionGroup.xml
index 9f7ee95527d..7814b4718f0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateAlignmentFieldIsNotDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateAlignmentFieldIsNotDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipInContentTypeEditFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipInContentTypeEditFormActionGroup.xml
index 3087c280202..05ca651991a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipInContentTypeEditFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipInContentTypeEditFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipNotVisibleInEditFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipNotVisibleInEditFormActionGroup.xml
index c8774ff7bce..a660c49012f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipNotVisibleInEditFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateMobileIconTooltipNotVisibleInEditFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldActionGroup.xml
index 0fc09d12e00..ff72a8e37f1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -11,7 +11,7 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
+        <waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
         <see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
         <seeElementInDOM selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="seePropertyControl"/>
     </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldAfterLabelTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldAfterLabelTextActionGroup.xml
index 320e483ca93..988fcb3ed82 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldAfterLabelTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldAfterLabelTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextActionGroup.xml
index 44e8217710f..652f05021af 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextWithUploaderIdActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextWithUploaderIdActionGroup.xml
new file mode 100644
index 00000000000..60ff75eafb4
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldHelperTextWithUploaderIdActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="validateSlideOutPanelFieldHelperTextWithUploaderId">
+        <annotations>
+            <description>Validates the helper text for a field on the edit panel form.</description>
+        </annotations>
+        <arguments>
+            <argument name="property"/>
+        </arguments>
+        <waitForElement time="2" selector="{{EditPanelForm.panelFieldHelperTextWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElement"/>
+        <see userInput="{{property.helperText}}" selector="{{EditPanelForm.panelFieldHelperTextWithUploaderId(property.section, property.fieldName)}}" stepKey="seeHelperText"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsDisabledActionGroup.xml
index b2d709be1f2..0a5d0290920 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotDisabledActionGroup.xml
index f75b95a4e3c..b13737cd61c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotRequiredActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotRequiredActionGroup.xml
index 3e9cf3e0280..5954606ac41 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotRequiredActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsNotRequiredActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsRequiredActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsRequiredActionGroup.xml
index 234299374d6..a090e010041 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsRequiredActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldIsRequiredActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoAfterLabelTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoAfterLabelTextActionGroup.xml
index f3bc7fbaebc..94e0edb6765 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoAfterLabelTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoAfterLabelTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoPlaceholderTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoPlaceholderTextActionGroup.xml
index 7f4b6720b0e..0dae655029f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoPlaceholderTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNoPlaceholderTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNotPresentActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNotPresentActionGroup.xml
index f44d7ba0ff9..98be95ae410 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNotPresentActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldNotPresentActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldPlaceholderTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldPlaceholderTextActionGroup.xml
index c1d1c4d4044..0f0c7b7140f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldPlaceholderTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldPlaceholderTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipActionGroup.xml
index 8849e359cbf..ea3621b9db4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipWithUploaderIdActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipWithUploaderIdActionGroup.xml
new file mode 100644
index 00000000000..02882adc9af
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldTooltipWithUploaderIdActionGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="validateSlideOutPanelFieldTooltipWithUploaderId">
+        <annotations>
+            <description>Validates the tooltip for a field on the edit panel form.</description>
+        </annotations>
+        <arguments>
+            <argument name="property"/>
+        </arguments>
+        <waitForElement time="2" selector="{{EditPanelForm.panelFieldTooltipWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForTooltip"/>
+        <moveMouseOver selector="{{EditPanelForm.panelFieldTooltipWithUploaderId(property.section, property.fieldName)}}" stepKey="mouseOverTooltip"/>
+        <waitForElementVisible selector="{{EditPanelForm.panelFieldTooltipContentWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForTooltipContentVisible"/>
+        <see userInput="{{property.tooltipText}}" selector="{{EditPanelForm.panelFieldTooltipContentWithUploaderId(property.section, property.fieldName)}}" stepKey="seeTooltipContent"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldWithUploaderIdActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldWithUploaderIdActionGroup.xml
new file mode 100644
index 00000000000..54e3a683349
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelFieldWithUploaderIdActionGroup.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="validateSlideOutPanelFieldWithUploaderId">
+        <arguments>
+            <argument name="property"/>
+        </arguments>
+        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
+        <see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
+        <seeElementInDOM selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="seePropertyControl"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelLinkUrlFieldActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelLinkUrlFieldActionGroup.xml
index 15e9029e79b..423b828758f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelLinkUrlFieldActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateSlideOutPanelLinkUrlFieldActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVerticalAlignmentVisualSelectsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVerticalAlignmentVisualSelectsActionGroup.xml
index f378b638dde..09114a31e06 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVerticalAlignmentVisualSelectsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVerticalAlignmentVisualSelectsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVisualSelectsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVisualSelectsActionGroup.xml
index 95e07251a66..6dd6f3e20be 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVisualSelectsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/ValidateVisualSelectsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml
new file mode 100644
index 00000000000..8ba814ca362
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormActionGroup/validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+  <actionGroup name="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup">
+    <arguments>
+      <argument name="property"/>
+    </arguments>
+    <waitForElementVisible time="2" selector="{{EditPanelForm.panelFieldNameWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForPropertyElement"/>
+    <dontSeeElement selector="{{EditPanelForm.panelFieldRequired(property.section, property.fieldName)}}" stepKey="seePropertyIsNotARequiredField"/>
+  </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/FillOutColorPickerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/FillOutColorPickerActionGroup.xml
index 3d859759719..d8856f34595 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/FillOutColorPickerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/FillOutColorPickerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/OpenAndValidateColorPickerValueActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/OpenAndValidateColorPickerValueActionGroup.xml
index e9a69e99109..5127c23921c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/OpenAndValidateColorPickerValueActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/OpenAndValidateColorPickerValueActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/PickColorSwatchCellActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/PickColorSwatchCellActionGroup.xml
index ad5a05d9f8f..a94d9d94c71 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/PickColorSwatchCellActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/PickColorSwatchCellActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeColorInColorSwatchActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeColorInColorSwatchActionGroup.xml
index 5b60ab2588b..cd407cf2f21 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeColorInColorSwatchActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeColorInColorSwatchActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeNoColorInColorSwatchActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeNoColorInColorSwatchActionGroup.xml
index d68e52f7f3e..4da8e77ee5e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeNoColorInColorSwatchActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormColorPickerActionGroup/SeeNoColorInColorSwatchActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyActionGroup.xml
index 3276b4f542f..138f8f09b2d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -15,8 +15,8 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
+        <attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-        <waitForElementVisible selector="{{EditPanelForm.editFormUploadedImage(property.section, property.fieldName)}}" stepKey="waitForImageUpload"/>
+        <waitForElementVisible selector="{{EditPanelForm.editFormUploadedImageWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForImageUpload"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyGeneralActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyGeneralActionGroup.xml
index a388477c98e..23860eb5f32 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyGeneralActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachFileSlideOutPropertyGeneralActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -15,9 +15,9 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForImageElement"/>
-        <attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="attachImageFile"/>
+        <waitForElement selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForImageElement"/>
+        <attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="attachImageFile"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
-        <waitForElementVisible time="10" selector="{{EditPanelForm.editFormUploadedImage(property.section, property.fieldName)}}" stepKey="waitForImageUploaded"/>
+        <waitForElementVisible time="10" selector="{{EditPanelForm.editFormUploadedImageWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForImageUploaded"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachInvalidFileOnSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachInvalidFileOnSlideOutActionGroup.xml
index e04f75751c9..e92916dbfab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachInvalidFileOnSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/AttachInvalidFileOnSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -11,7 +11,7 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
+        <attachFile userInput="{{property.value}}" selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="attachBackgroundImageFile"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{EditPanelForm.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
         <waitForElementVisible selector="{{EditPanelForm.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/ClickSelectFromGallerySlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/ClickSelectFromGallerySlideOutActionGroup.xml
index f67fb236601..7c7d3920e8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/ClickSelectFromGallerySlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/ClickSelectFromGallerySlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -11,8 +11,8 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <waitForElementVisible selector="{{EditPanelForm.selectFromGalleryBtn(property.section, property.fieldName)}}" stepKey="waitForSelectFromGalleryBtn"/>
-        <click selector="{{EditPanelForm.selectFromGalleryBtn(property.section, property.fieldName)}}" stepKey="clickSelectFromGalleryBtn"/>
+        <waitForElementVisible selector="{{EditPanelForm.selectFromGalleryBtnWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForSelectFromGalleryBtn"/>
+        <click selector="{{EditPanelForm.selectFromGalleryBtnWithUploaderId(property.section, property.fieldName)}}" stepKey="clickSelectFromGalleryBtn"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
     </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeImageUploadedOnSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeImageUploadedOnSlideOutActionGroup.xml
index 0042b9dab52..b2c8444195d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeImageUploadedOnSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeImageUploadedOnSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -11,7 +11,7 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement"/>
-        <waitForElementVisible selector="{{EditPanelForm.editFormUploadedImageSource(property.section, property.fieldName, property.fileName, property.extension)}}" stepKey="seeUploadedFile"/>
+        <waitForElement selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElement"/>
+        <waitForElementVisible selector="{{EditPanelForm.editFormUploadedImageSourceWithUploaderId(property.section, property.fieldName, property.fileName, property.extension)}}" stepKey="seeUploadedFile"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeNoImageUploadedOnSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeNoImageUploadedOnSlideOutActionGroup.xml
index 29c7c325c88..780a963d09e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeNoImageUploadedOnSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/EditFormImageUploadActionGroup/SeeNoImageUploadedOnSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -11,7 +11,7 @@
         <arguments>
             <argument name="property"/>
         </arguments>
-        <waitForElement selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement"/>
+        <waitForElement selector="{{EditPanelForm.panelFieldControlWithUploaderId(property.section, property.fieldName)}}" stepKey="waitForElement"/>
         <waitForElementVisible selector="{{EditPanelForm.editFormNoUploadedImage(property.name)}}" stepKey="seeNoUploadedFile"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidateContentWidthEqualToContainerWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidateContentWidthEqualToContainerWidthActionGroup.xml
index ac6ce574a34..59b6acb3465 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidateContentWidthEqualToContainerWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidateContentWidthEqualToContainerWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidatePositionRightWithinContainerActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidatePositionRightWithinContainerActionGroup.xml
index 23c8e3d6c16..3d5afc51e8f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidatePositionRightWithinContainerActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ElementPositioningActionGroup/ValidatePositionRightWithinContainerActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/RestoreLayoutSettingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/RestoreLayoutSettingActionGroup.xml
index 12efa9ef7f3..4878cc4e4cf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/RestoreLayoutSettingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/RestoreLayoutSettingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightPlusPaddingAndBorderActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightPlusPaddingAndBorderActionGroup.xml
index 28eae723f21..fef4f9979bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightPlusPaddingAndBorderActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightEqualToMinHeightPlusPaddingAndBorderActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightGreaterThanMinHeightActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightGreaterThanMinHeightActionGroup.xml
index f6e14f82fae..581fd8bf220 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightGreaterThanMinHeightActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeHeightGreaterThanMinHeightActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeWidthEqualToMaxWidthActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeWidthEqualToMaxWidthActionGroup.xml
index b2b1d402645..dafccf1ff1f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeWidthEqualToMaxWidthActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateContentTypeWidthEqualToMaxWidthActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutConfigurationWithAllUpdatedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutConfigurationWithAllUpdatedActionGroup.xml
index 3f7e32154a7..a28dc3f9df4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutConfigurationWithAllUpdatedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutConfigurationWithAllUpdatedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesNoHeightActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesNoHeightActionGroup.xml
index 84a16348d29..48b35b1b58b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesNoHeightActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesNoHeightActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesWithAllUpdatedActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesWithAllUpdatedActionGroup.xml
index 70bb7127f24..fd70aa6ae74 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesWithAllUpdatedActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/LayoutConfigurationActionGroup/ValidateLayoutStylesWithAllUpdatedActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/AddChildContentTypeFromOptionMenuActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/AddChildContentTypeFromOptionMenuActionGroup.xml
index c4bb8e8f501..cecf64851c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/AddChildContentTypeFromOptionMenuActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/AddChildContentTypeFromOptionMenuActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/CloseConfirmModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/CloseConfirmModalActionGroup.xml
index 103bfe47e03..fe34a50e2e7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/CloseConfirmModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/CloseConfirmModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ConfirmRemovalModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ConfirmRemovalModalActionGroup.xml
index 4bf0595ef3d..39909310d9a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ConfirmRemovalModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ConfirmRemovalModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateContentTypeActionGroup.xml
index 1b6dd3cfa49..91a564b423e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateSmallContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateSmallContentTypeActionGroup.xml
index 2b3432e31a8..bf7e7d4492c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateSmallContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/DuplicateSmallContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideContentTypeActionGroup.xml
index 9038264cae5..67b1674b0c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideSmallContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideSmallContentTypeActionGroup.xml
index b369f890ead..be46c51392d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideSmallContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/HideSmallContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenOptionsMenuActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenOptionsMenuActionGroup.xml
index b2950e566db..f35aec410dd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenOptionsMenuActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenOptionsMenuActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelActionGroup.xml
index 866f07dd003..4a72b4b3825 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelByIndexActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelByIndexActionGroup.xml
index 0d21141f807..3a2a35d4739 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelByIndexActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelByIndexActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelSmallByIndexActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelSmallByIndexActionGroup.xml
index 8ef90aed143..dcddf1e5b12 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelSmallByIndexActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderEditPanelSmallByIndexActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderOptionsMenuSmallByIndexActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderOptionsMenuSmallByIndexActionGroup.xml
index 275950763e4..dfebcde55cf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderOptionsMenuSmallByIndexActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/OpenPageBuilderOptionsMenuSmallByIndexActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageActionGroup.xml
index 293ee9ea196..8a245ebc9af 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageByIndexActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageByIndexActionGroup.xml
index 5757aaaf32e..1b7096d40c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageByIndexActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageByIndexActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageSmallByIndexActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageSmallByIndexActionGroup.xml
index 3099c92cf3a..f941e7f9333 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageSmallByIndexActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveContentTypeFromStageSmallByIndexActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveEmptyContentTypeFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveEmptyContentTypeFromStageActionGroup.xml
index 90bc21c0676..44144ec0ebe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveEmptyContentTypeFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/RemoveEmptyContentTypeFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowContentTypeActionGroup.xml
index 649fa9eb784..cecdb481103 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowSmallContentTypeActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowSmallContentTypeActionGroup.xml
index 699d30570f8..e4413f9dd71 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowSmallContentTypeActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ShowSmallContentTypeActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/UnFocusOptionMenuActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/UnFocusOptionMenuActionGroup.xml
index 6abce6db625..8c3ffab2455 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/UnFocusOptionMenuActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/UnFocusOptionMenuActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverNoOptionMenuActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverNoOptionMenuActionGroup.xml
index 78986fe3702..226e4aa9dbc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverNoOptionMenuActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverNoOptionMenuActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverOptionMenuActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverOptionMenuActionGroup.xml
index ac48e0bbd20..0d6f0d1d2fb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverOptionMenuActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OptionsMenuActionGroup/ValidateOnHoverOptionMenuActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml
index ab62a934671..58ca342d5c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonCollageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml
index 492f8e0b983..f0bf2c34aff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayAndButtonPosterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -27,7 +27,7 @@
         <executeJS function="return parseInt({$columnWidth} - {{columnPadding.paddingLeft}} - {{columnPadding.paddingRight}} - ({{columnBorderWidth.value}} * 2))" stepKey="expectedElementWidth"/>
         <executeJS function="return Math.abs({$expectedElementWidth} - {$elementWidth})" stepKey="elementDiff"/>
         <!-- We will allow a 2px offset to account for rounding and any additional threshold that is passed in as an argument -->
-        <executeJS function="return parseInt({{diffThreshold}} + 2)" stepKey="acceptableOffset"/>
+        <executeJS function="return parseInt({{diffThreshold}} + 4)" stepKey="acceptableOffset"/>
         <assertLessThanOrEqual stepKey="assertElementWidthEqualsColumnWidthLessPaddingAndBorder">
             <expectedResult type="variable">acceptableOffset</expectedResult>
             <actualResult type="variable">elementDiff</actualResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionBottomActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionBottomActionGroup.xml
index 8b5ef216482..dfe7608c595 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionBottomActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionBottomActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageCenterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageCenterActionGroup.xml
index 3d31e76aec8..3ce32e628c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageCenterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageCenterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageLeftActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageLeftActionGroup.xml
index 86d08dbc1da..8d93e1a7fe4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageLeftActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageLeftActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageRightActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageRightActionGroup.xml
index ee677a643e6..02bae55f551 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageRightActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionCollageRightActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionPosterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionPosterActionGroup.xml
index cea3c417d70..75f60a28c09 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionPosterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionPosterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionTopActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionTopActionGroup.xml
index 67e3406fa53..94d6c0cad1b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionTopActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/OverlayActionGroup/ValidateOverlayPositionTopActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ClosePageBuilderPanelMenuSectionsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ClosePageBuilderPanelMenuSectionsActionGroup.xml
index 1e56c980ab5..c34ae5de867 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ClosePageBuilderPanelMenuSectionsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ClosePageBuilderPanelMenuSectionsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ExpandPageBuilderPanelMenuSectionActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ExpandPageBuilderPanelMenuSectionActionGroup.xml
index bed7c2212f9..6267d81de41 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ExpandPageBuilderPanelMenuSectionActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ExpandPageBuilderPanelMenuSectionActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ValidateMenuSectionsAndContentTypesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ValidateMenuSectionsAndContentTypesActionGroup.xml
index ff1ac29663d..f5b377ecd0d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ValidateMenuSectionsAndContentTypesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/PanelActionGroup/ValidateMenuSectionsAndContentTypesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AddInvalidFileToStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AddInvalidFileToStageActionGroup.xml
index 12504e2c1f8..5ced7a040b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AddInvalidFileToStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AddInvalidFileToStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -22,7 +22,7 @@
         <moveMouseOver selector="{{section.base('1')}}" stepKey="hoverSectionArea"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible selector="{{PageBuilderStage.onHoverUploadImageButton(contentType.role, '1')}}" stepKey="waitForUploadImageButton"/>
-        <attachFile userInput="{{file.value}}" selector="{{section.uploadImageInput('1')}}" stepKey="attachFile"/>
+        <attachFile userInput="{{file.value}}" selector="{{section.uploadImageInputWithUploaderId('1')}}" stepKey="attachFile"/>
         <waitForPageLoad stepKey="waitForFileLoad"/>
         <waitForElementVisible selector="{{PageBuilderStage.modal}}" stepKey="waitForModal"/>
         <waitForElementVisible selector="{{PageBuilderStage.errorModalMessage(file.errorMessage)}}" stepKey="waitForModalMessage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml
index a6cecde51fd..3c0abcb642a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminOpenPageBuilderFromContentPreviewOverlayActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminSwitchPageBuilderViewportActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminSwitchPageBuilderViewportActionGroup.xml
index 51cc1a7897f..d5f31935d0b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminSwitchPageBuilderViewportActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminSwitchPageBuilderViewportActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminVerifyEmptyStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminVerifyEmptyStageActionGroup.xml
index 666aca2d5dd..7ba83702d82 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminVerifyEmptyStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/AdminVerifyEmptyStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ClickEditWithPageBuilderButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ClickEditWithPageBuilderButtonActionGroup.xml
index c762e0a783c..fe388a6eae8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ClickEditWithPageBuilderButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ClickEditWithPageBuilderButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ClickEditWithPageBuilderButtonActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ExitPageBuilderFullScreenActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ExitPageBuilderFullScreenActionGroup.xml
index 8c6cb3960c7..b9a9fb559c6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ExitPageBuilderFullScreenActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ExitPageBuilderFullScreenActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTextAreaEditorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTextAreaEditorActionGroup.xml
index 944d81e4893..2020938c60a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTextAreaEditorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTextAreaEditorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTinyMCEEditorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTinyMCEEditorActionGroup.xml
index 3379d27083a..71f7df41dd3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTinyMCEEditorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/FocusOnInlineTinyMCEEditorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTextAreaEditorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTextAreaEditorActionGroup.xml
index 297dc802622..9269559ae88 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTextAreaEditorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTextAreaEditorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTinyMCEEditorActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTinyMCEEditorActionGroup.xml
index 3d0b912cb80..696ba050981 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTinyMCEEditorActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToEndOfLineTinyMCEEditorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToMediaStorageFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToMediaStorageFromStageActionGroup.xml
index 6f6240a680e..50240df4cd0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToMediaStorageFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/GoToMediaStorageFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/OpenPageBuilderFullScreenActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/OpenPageBuilderFullScreenActionGroup.xml
index 5ac0b253dfd..fde6381ea51 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/OpenPageBuilderFullScreenActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/OpenPageBuilderFullScreenActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="openPageBuilderFullScreen" deprecated="This action group is no longer supported. Consider using `ClickEditWithPageBuilderButtonActionGroup` instead.">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml
index 7609dcde849..28dbb99ad87 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ScrollToActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/SwitchTabAndReloadPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/SwitchTabAndReloadPageActionGroup.xml
index f866deae60f..53932cbb2d1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/SwitchTabAndReloadPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/SwitchTabAndReloadPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadBackgroundImageToContentTypeFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadBackgroundImageToContentTypeFromStageActionGroup.xml
index a62e14c968c..3b5620f9251 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadBackgroundImageToContentTypeFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadBackgroundImageToContentTypeFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -16,7 +16,7 @@
             <argument name="section"/>
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
-        <attachFile userInput="{{backgroundImage.value}}" selector="{{section.uploadImageInput(index)}}" stepKey="attachBackgroundImageFromLocalToStage"/>
+        <attachFile userInput="{{backgroundImage.value}}" selector="{{section.uploadImageInputWithUploaderId(index)}}" stepKey="attachBackgroundImageFromLocalToStage"/>
         <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
         <executeJS function="return window.getComputedStyle(document.evaluate('{{section.backgroundPath(index)}}', document.body).iterateNext()).backgroundImage" stepKey="backgroundImageRawValue"/>
         <!-- Return the string value of background-image -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadImageToContentTypeFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadImageToContentTypeFromStageActionGroup.xml
index d275986b72d..75f3ad30291 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadImageToContentTypeFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadImageToContentTypeFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -13,7 +13,7 @@
             <argument name="section" defaultValue="PageBuilderStage"/>
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
-        <attachFile userInput="{{property.value}}" selector="{{section.uploadImageInput(index)}}" stepKey="attachImageFromLocalToStage"/>
+        <attachFile userInput="{{property.value}}" selector="{{section.uploadImageInputWithUploaderId(index)}}" stepKey="attachImageFromLocalToStage"/>
         <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
         <waitForElementVisible selector="{{section.imageSourceByIndex(index, property.fileName)}}" stepKey="waitForMainImageSource1"/>
     </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadNewBackgroundImageToContentTypeFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadNewBackgroundImageToContentTypeFromStageActionGroup.xml
new file mode 100644
index 00000000000..38a03a9f6e1
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadNewBackgroundImageToContentTypeFromStageActionGroup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="UploadNewBackgroundImageToContentTypeFromStageActionGroup">
+        <annotations>
+            <description>Loads background image from Stage</description>
+        </annotations>
+        <arguments>
+            <argument name="backgroundImage" defaultValue="PageBuilderImageProperty_JPG"/>
+            <argument name="section"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <attachFile userInput="{{backgroundImage.value}}" selector="{{section.uploadNewImageInputWithUploaderId(index)}}" stepKey="attachBackgroundImageFromLocalToStage"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
+        <executeJS function="return window.getComputedStyle(document.evaluate('{{section.backgroundPath(index)}}', document.body).iterateNext()).backgroundImage" stepKey="backgroundImageRawValue"/>
+        <!-- Return the string value of background-image -->
+        <executeJS function="return '{{backgroundImage.value}}' ? '{$backgroundImageRawValue}'.match(/(?&lt;=(url\((&quot;|\'))).+(?=(&quot;|\')\))/)[0] : ''" stepKey="backgroundImageValue"/>
+        <!-- Convert all characters in string variables to regex friendly strings  -->
+        <executeJS function="return '{{backgroundImage.path}}'.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\\\^\\$\|]/g, '\\\\$&amp;')" stepKey="regexFilePath"/>
+        <executeJS function="return '{{backgroundImage.value}}' ? !!'{$backgroundImageValue}'.match(/.*\/(pub\/|\/)?media.*{$regexFilePath}\/{{backgroundImage.fileName}}(_\d+)?\.{{backgroundImage.extension}}/)[0] : '{$backgroundImageRawValue}' === 'none'" stepKey="actualImageResult"/>
+        <assertTrue stepKey="assertBackgroundImageContainsFileInformation">
+            <actualResult type="variable">actualImageResult</actualResult>
+        </assertTrue>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadNewImageToContentTypeFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadNewImageToContentTypeFromStageActionGroup.xml
new file mode 100644
index 00000000000..2f46d683ad0
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/UploadNewImageToContentTypeFromStageActionGroup.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="UploadNewImageToContentTypeFromStageActionGroup">
+        <arguments>
+            <argument name="property"/>
+            <argument name="section" defaultValue="PageBuilderStage"/>
+            <argument name="index" defaultValue="1" type="string"/>
+        </arguments>
+        <attachFile userInput="{{property.value}}" selector="{{section.uploadNewImageInputWithUploaderId(index)}}" stepKey="attachImageFromLocalToStage"/>
+        <waitForPageLoad stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible selector="{{section.imageSourceByIndex(index, property.fileName)}}" stepKey="waitForMainImageSource1"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageActionGroup.xml
index 50339cb13d3..e42e8930ddf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageWithoutPaddingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageWithoutPaddingActionGroup.xml
index d123f0f58de..3d3c891ff62 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageWithoutPaddingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeHeightOnStageWithoutPaddingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeInsideContainerStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeInsideContainerStageActionGroup.xml
index e5be4770b19..d4d11aa6d71 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeInsideContainerStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeInsideContainerStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeNotInsideContainerStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeNotInsideContainerStageActionGroup.xml
index fb3919aa6f0..e08b31f07a0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeNotInsideContainerStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidateContentTypeNotInsideContainerStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml
index 483624e1445..182626aa2b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/ValidatePageBuilderPreviewActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="ValidatePageBuilderPreviewActionGroup">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyEmptyStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyEmptyStageActionGroup.xml
index ff923e37e16..3f4f9317bf9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyEmptyStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyEmptyStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifySelectFromGalleryButtonWorksActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifySelectFromGalleryButtonWorksActionGroup.xml
index e1c26d306cf..b608c56eead 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifySelectFromGalleryButtonWorksActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifySelectFromGalleryButtonWorksActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyUploadImageButtonsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyUploadImageButtonsActionGroup.xml
index a77bcaefd92..b36f6ec5ba6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyUploadImageButtonsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StageActionGroup/VerifyUploadImageButtonsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ApplyGoogleMapsAPIKeyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ApplyGoogleMapsAPIKeyActionGroup.xml
index 85c760b9588..2e401730ae9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ApplyGoogleMapsAPIKeyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ApplyGoogleMapsAPIKeyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ClickAndValidateGoogleMapsAPIKeyTestKeyButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ClickAndValidateGoogleMapsAPIKeyTestKeyButtonActionGroup.xml
index a54df877cd7..11762f3e97d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ClickAndValidateGoogleMapsAPIKeyTestKeyButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/ClickAndValidateGoogleMapsAPIKeyTestKeyButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/DisablePageBuilderSettingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/DisablePageBuilderSettingActionGroup.xml
index 54762b0db15..82794f5ba42 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/DisablePageBuilderSettingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/DisablePageBuilderSettingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/EnablePageBuilderSettingActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/EnablePageBuilderSettingActionGroup.xml
index 74529d69fec..390818aa449 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/EnablePageBuilderSettingActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/EnablePageBuilderSettingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsAPIKeyActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsAPIKeyActionGroup.xml
index bd6238e0064..6d7e66b2f7f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsAPIKeyActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsAPIKeyActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsStyleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsStyleActionGroup.xml
index cd9a381cb6a..865368b12dd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsStyleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/InputGoogleMapsStyleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateDefaultGridSizeConfigActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateDefaultGridSizeConfigActionGroup.xml
index 5d5eb785d5e..371d4da7e02 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateDefaultGridSizeConfigActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateDefaultGridSizeConfigActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateMaxGridSizeConfigActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateMaxGridSizeConfigActionGroup.xml
index f5854fe5e71..30ddad91047 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateMaxGridSizeConfigActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StoreConfigurationActionGroup/UpdateMaxGridSizeConfigActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontActionGroup.xml
index a536c9a5ea7..29928371ac3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontWithStoreViewActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontWithStoreViewActionGroup.xml
index ee3ef587810..182e4205f17 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontWithStoreViewActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/NavigateToStoreFrontWithStoreViewActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontAddProductReviewProductFullWidthLayoutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontAddProductReviewProductFullWidthLayoutActionGroup.xml
index c4b133ac565..3bf42016fbe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontAddProductReviewProductFullWidthLayoutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontAddProductReviewProductFullWidthLayoutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontValidateCategoryDescriptionAppearanceActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontValidateCategoryDescriptionAppearanceActionGroup.xml
index 064dbc8ffa6..b50e6ce9b39 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontValidateCategoryDescriptionAppearanceActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/StorefrontValidateCategoryDescriptionAppearanceActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontActionGroup.xml
index 0da0df7f378..69b7c60f8ed 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontInDOMActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontInDOMActionGroup.xml
index 75ada6ba12a..33cc3d902f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontInDOMActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/ValidateContentTypeInsideContainerStorefrontInDOMActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/VerifyCmsPageLinkOnFrontendActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/VerifyCmsPageLinkOnFrontendActionGroup.xml
index 2b27932713b..c8e222b9b8b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/VerifyCmsPageLinkOnFrontendActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/StorefrontActionGroup/VerifyCmsPageLinkOnFrontendActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ChoosePageBuilderTemplateCreatedForOptionsInFilterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ChoosePageBuilderTemplateCreatedForOptionsInFilterActionGroup.xml
index 5fd39914fa2..89eea91316b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ChoosePageBuilderTemplateCreatedForOptionsInFilterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ChoosePageBuilderTemplateCreatedForOptionsInFilterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClearFiltersPageBuilderTemplateGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClearFiltersPageBuilderTemplateGridActionGroup.xml
index 6875b20a232..576974ff332 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClearFiltersPageBuilderTemplateGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClearFiltersPageBuilderTemplateGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml
index f125b4a2f7b..6417355ca0e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyPageBuilderTemplatesGridFilterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyPageBuilderTemplatesGridFilterActionGroup.xml
index 9a6662eb191..309e3c85669 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyPageBuilderTemplatesGridFilterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickApplyPageBuilderTemplatesGridFilterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickCloseOnPageBuilderSaveTemplateConfirmationModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickCloseOnPageBuilderSaveTemplateConfirmationModalActionGroup.xml
index bffd5c2ad7c..0a99d708122 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickCloseOnPageBuilderSaveTemplateConfirmationModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickCloseOnPageBuilderSaveTemplateConfirmationModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickNextPageOnPageBuilderTemplateGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickNextPageOnPageBuilderTemplateGridActionGroup.xml
index 635478b24db..e2530be8ada 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickNextPageOnPageBuilderTemplateGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickNextPageOnPageBuilderTemplateGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickOkOnPageBuilderSaveTemplateErrorModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickOkOnPageBuilderSaveTemplateErrorModalActionGroup.xml
index a5b50c0a1bb..e322cdb99ab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickOkOnPageBuilderSaveTemplateErrorModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickOkOnPageBuilderSaveTemplateErrorModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickPreviousPageOnPageBuilderTemplateGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickPreviousPageOnPageBuilderTemplateGridActionGroup.xml
index 107f6aca7ae..f24ab083bdc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickPreviousPageOnPageBuilderTemplateGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickPreviousPageOnPageBuilderTemplateGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalActionGroup.xml
index 52277d31703..e6fb9e7bc34 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectErrorModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectErrorModalActionGroup.xml
index 9201125dfa7..799f0bf1daf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectErrorModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectErrorModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectNoChangesActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectNoChangesActionGroup.xml
index 4912a565b49..7269207894e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectNoChangesActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClickSaveOnPageBuilderSaveTemplateModalAndExpectNoChangesActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderApplyTemplateSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderApplyTemplateSlideOutActionGroup.xml
index a57712ea6e3..521b4e9fc79 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderApplyTemplateSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderApplyTemplateSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderSaveTemplateModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderSaveTemplateModalActionGroup.xml
index 9c70fa380ba..e81f48d6622 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderSaveTemplateModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderSaveTemplateModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderTemplatePreviewImageModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderTemplatePreviewImageModalActionGroup.xml
index 2c3fe137b1c..407923c7734 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderTemplatePreviewImageModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ClosePageBuilderTemplatePreviewImageModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ConfirmApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ConfirmApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml
index 3264d42c275..8808ac6d873 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ConfirmApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ConfirmApplyFromPageBuilderApplyTemplateSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/DeletePageBuilderTemplateActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/DeletePageBuilderTemplateActionGroup.xml
index a942f89d73e..9fd737ad1f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/DeletePageBuilderTemplateActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/DeletePageBuilderTemplateActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/EditPageBuilderTemplateGridTotalResultsPerPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/EditPageBuilderTemplateGridTotalResultsPerPageActionGroup.xml
index 7fec606e494..9b578800c71 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/EditPageBuilderTemplateGridTotalResultsPerPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/EditPageBuilderTemplateGridTotalResultsPerPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormActionGroup.xml
index c33ea47e7dc..033d297f254 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormWithSpaceForTemplateNameActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormWithSpaceForTemplateNameActionGroup.xml
index 86aa448a5ff..409faa3c874 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormWithSpaceForTemplateNameActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FillPageBuilderSaveTemplateFormWithSpaceForTemplateNameActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByCreatedDateActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByCreatedDateActionGroup.xml
index d73182de64d..8bbc41b6f37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByCreatedDateActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByCreatedDateActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByIdActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByIdActionGroup.xml
index d1b470c15b9..d6ba4199353 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByIdActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByIdActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByNameActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByNameActionGroup.xml
index 2372f68231d..0f4b8c6d6e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByNameActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/FilterPageBuilderTemplateGridByNameActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageActionGroup.xml
index 79cf9065a33..126b6a3ec8f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup.xml
index d240f78bfbe..3d0d8ebe63c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/NavigateToPageBuilderTemplatesGridPageWithSecretKeyEnabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderApplyTemplateSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderApplyTemplateSlideOutActionGroup.xml
index df21471b5de..a089b10ee8c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderApplyTemplateSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderApplyTemplateSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderSaveTemplateModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderSaveTemplateModalActionGroup.xml
index a2d3bfe1096..5a375630bd4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderSaveTemplateModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderSaveTemplateModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatePreviewImageModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatePreviewImageModalActionGroup.xml
index 217798b50a5..7232d145f96 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatePreviewImageModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatePreviewImageModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatesGridFilterActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatesGridFilterActionGroup.xml
index b60519fd89b..6f9149f75ba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatesGridFilterActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/OpenPageBuilderTemplatesGridFilterActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SavePageBuilderTemplateActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SavePageBuilderTemplateActionGroup.xml
index 519d963aacb..d1586a62d3a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SavePageBuilderTemplateActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SavePageBuilderTemplateActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SearchByKeywordPageBuilderTemplateGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SearchByKeywordPageBuilderTemplateGridActionGroup.xml
index b10a8ebcddd..d6c1c1c4f53 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SearchByKeywordPageBuilderTemplateGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SearchByKeywordPageBuilderTemplateGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SortPageBuilderTemplateGridColumnActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SortPageBuilderTemplateGridColumnActionGroup.xml
index d53505fa23e..199ed3fb9e7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SortPageBuilderTemplateGridColumnActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/SortPageBuilderTemplateGridColumnActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateConfirmationModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateConfirmationModalActionGroup.xml
index 7978a49ca5b..b813b9b0b86 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateConfirmationModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateConfirmationModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateErrorModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateErrorModalActionGroup.xml
index f3b6db65695..2e40b8e4528 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateErrorModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateErrorModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateModalActionGroup.xml
index e4274b67c67..ce567e99761 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderSaveTemplateModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateDataInGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateDataInGridActionGroup.xml
index 66d2b655947..0bb19c5584a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateDataInGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateDataInGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateEmptyGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateEmptyGridActionGroup.xml
index ce5ad8a0f7c..dbbacaef598 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateEmptyGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplateEmptyGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplatePreviewImageModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplatePreviewImageModalActionGroup.xml
index f51913ac1fd..16d7afe847d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplatePreviewImageModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidatePageBuilderTemplatePreviewImageModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalNumberOfRowsInPageBuilderTemplateGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalNumberOfRowsInPageBuilderTemplateGridActionGroup.xml
index 8ce03ffe523..f044a2ce3ab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalNumberOfRowsInPageBuilderTemplateGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalNumberOfRowsInPageBuilderTemplateGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalRecordsFoundInPageBuilderTemplateGridActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalRecordsFoundInPageBuilderTemplateGridActionGroup.xml
index b3af0264434..3f04123408e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalRecordsFoundInPageBuilderTemplateGridActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/ValidateTotalRecordsFoundInPageBuilderTemplateGridActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyCannotNavigateToPageBuilderTemplatesGridPageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyCannotNavigateToPageBuilderTemplatesGridPageActionGroup.xml
index e0db309eb71..bcf91e6f4ad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyCannotNavigateToPageBuilderTemplatesGridPageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyCannotNavigateToPageBuilderTemplatesGridPageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderDeleteTemplateButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderDeleteTemplateButtonActionGroup.xml
index b4aa13607a1..7a5b2057cda 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderDeleteTemplateButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderDeleteTemplateButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderSaveOrApplyTemplateButtonsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderSaveOrApplyTemplateButtonsActionGroup.xml
index e0e4750217c..5ba14d6924b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderSaveOrApplyTemplateButtonsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/TemplatesActionGroup/VerifyNoPageBuilderSaveOrApplyTemplateButtonsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup.xml
index 1f6888dc898..3eeae3cfbd7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleDoesNotEqualExpectedStyleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml
index e3efea3b860..f860e19957e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ValidateContentTypesStyleEqualsExpectedStyleActionGroup.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
-        <annotations>
-            <description>Content types expected style equals the computed style</description>
-        </annotations>
-        <arguments>
-            <argument name="selector" type="string"/>
-            <argument name="expectedProperty" type="string"/>
-            <argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
-        </arguments>
-        <executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
-        <assertEquals stepKey="propertyIsEqualsAsExpected">
-            <expectedResult type="string">{{expectedProperty}}</expectedResult>
-            <actualResult type="variable">fetchedProperty</actualResult>
-        </assertEquals>
-    </actionGroup>
+  <actionGroup name="ValidateContentTypesStyleEqualsExpectedStyleActionGroup">
+    <annotations>
+      <description>Content types expected style equals the computed style</description>
+    </annotations>
+    <arguments>
+      <argument name="selector" type="string"/>
+      <argument name="expectedProperty" type="string"/>
+      <argument name="cssProperty" defaultValue="backgroundColor" type="string"/>
+    </arguments>
+    <executeJS function="return window.getComputedStyle(document.evaluate('{{selector}}', document.body).iterateNext()).{{cssProperty}}.replace(/px/g, &quot;&quot;)" stepKey="fetchedProperty"/>
+    <assertEquals stepKey="propertyIsEqualsAsExpected">
+      <expectedResult type="string">{{expectedProperty}}</expectedResult>
+      <actualResult type="variable">fetchedProperty</actualResult>
+    </assertEquals>
+  </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkVariableWYSIWYGDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkVariableWYSIWYGDisabledActionGroup.xml
index 28b6e8d16e6..4ebe46ce0e7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkVariableWYSIWYGDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkVariableWYSIWYGDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEActionGroup.xml
index d6ba310bdaa..3d8e38b7994 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEInlineActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEInlineActionGroup.xml
index 1a1ceafc8e9..01aa79e57d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEInlineActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEInlineActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEWithAnchorAndTitleActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEWithAnchorAndTitleActionGroup.xml
index ff8969f6633..f0c8469d761 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEWithAnchorAndTitleActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetToTinyMCEWithAnchorAndTitleActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetWYSIWYGDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetWYSIWYGDisabledActionGroup.xml
index f9fbf899a6c..89aa6fba7d8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetWYSIWYGDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddPageLinkWidgetWYSIWYGDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEActionGroup.xml
index 40d571db58b..5cc9a165c8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineActionGroup.xml
index 01f984c2f62..97628ad55e1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineWYSIWYGDisabledActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineWYSIWYGDisabledActionGroup.xml
index ae239226c5a..fdd6a4279cd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineWYSIWYGDisabledActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEInlineWYSIWYGDisabledActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEMobileFormActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEMobileFormActionGroup.xml
index f2d96cce183..00d7a130e16 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEMobileFormActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddTextToTinyMCEMobileFormActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEActionGroup.xml
index 31374ed6717..737f62c600c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEInlineActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEInlineActionGroup.xml
index 5317a7744a1..5ced40baeb7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEInlineActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AddVariableToTinyMCEInlineActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminOpenInsertWidgetSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetButtonInInlineTinyMCEEditorActionGroup.xml
similarity index 91%
rename from app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminOpenInsertWidgetSlideOutActionGroup.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetButtonInInlineTinyMCEEditorActionGroup.xml
index 364b1077670..d15490ff009 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminOpenInsertWidgetSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetButtonInInlineTinyMCEEditorActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetFromInsertWidgetSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetFromInsertWidgetSlideOutActionGroup.xml
index 8005d999339..50124486589 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetFromInsertWidgetSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminClickInsertWidgetFromInsertWidgetSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminSelectCatalogProductsListWidgetFromInsertWidgetSlideOutActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminSelectCatalogProductsListWidgetFromInsertWidgetSlideOutActionGroup.xml
index 6a87ec59ec9..bae22623cca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminSelectCatalogProductsListWidgetFromInsertWidgetSlideOutActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminSelectCatalogProductsListWidgetFromInsertWidgetSlideOutActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminValidateContentTextInTinyMCEIFrameActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminValidateContentTextInTinyMCEIFrameActionGroup.xml
index d5d788a4a37..a050b2c0f42 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminValidateContentTextInTinyMCEIFrameActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminValidateContentTextInTinyMCEIFrameActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminVerifyTinyMCEToolbarButtonsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminVerifyTinyMCEToolbarButtonsActionGroup.xml
index f10ef03ba4d..681a666b343 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminVerifyTinyMCEToolbarButtonsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AdminVerifyTinyMCEToolbarButtonsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertSelectedTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertSelectedTextActionGroup.xml
index c9c34e86c76..77dbf5f50a1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertSelectedTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertSelectedTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertTextareaContainsValueActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertTextareaContainsValueActionGroup.xml
index 6b98e575955..408d94503da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertTextareaContainsValueActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/AssertTextareaContainsValueActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickDirectiveTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickDirectiveTinyMCEActionGroup.xml
index 74087464375..dd9d8e32774 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickDirectiveTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickDirectiveTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickInsertImageInTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickInsertImageInTinyMCEActionGroup.xml
index 53a6a98b7c2..165e2ec13b0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickInsertImageInTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickInsertImageInTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickMediaGalleryStorageRootArrowActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickMediaGalleryStorageRootArrowActionGroup.xml
index 8888bec612c..ee19007f818 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickMediaGalleryStorageRootArrowActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickMediaGalleryStorageRootArrowActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickTinyMCEInsertImageButtonActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickTinyMCEInsertImageButtonActionGroup.xml
index 820e1bc41ee..824e70452ef 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickTinyMCEInsertImageButtonActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ClickTinyMCEInsertImageButtonActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseVariablePanelTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseVariablePanelTinyMCEActionGroup.xml
index d76b26f43db..c52987dea1b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseVariablePanelTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseVariablePanelTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseWidgetPanelTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseWidgetPanelTinyMCEActionGroup.xml
index 411f152b4bd..4797c5a2b5f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseWidgetPanelTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/CloseWidgetPanelTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickToInlineEditWYSIWYGFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickToInlineEditWYSIWYGFromStageActionGroup.xml
index 48be54da2d1..e592962d0ee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickToInlineEditWYSIWYGFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickToInlineEditWYSIWYGFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickVariableTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickVariableTinyMCEActionGroup.xml
index 439a4370170..754757497bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickVariableTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickVariableTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickWidgetTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickWidgetTinyMCEActionGroup.xml
index 8349cde2323..6c5f5a5ca4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickWidgetTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/DoubleClickWidgetTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FillTinyMCEInsertImageModalAndSaveActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FillTinyMCEInsertImageModalAndSaveActionGroup.xml
index f2e047459f5..11a6181889d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FillTinyMCEInsertImageModalAndSaveActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FillTinyMCEInsertImageModalAndSaveActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FocusTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FocusTinyMCEActionGroup.xml
index 2fc170df1ec..90f846f5809 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FocusTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FocusTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FormatTextTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FormatTextTinyMCEActionGroup.xml
index ddea7184c52..d7964948b1e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FormatTextTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/FormatTextTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -15,6 +15,7 @@
         </arguments>
         <waitForElementVisible selector="{{section.formatSelector}}" stepKey="waitForFormatList"/>
         <click selector="{{section.formatSelector}}" stepKey="expandFormatList"/>
+        <click selector="{{section.HeadSelector}}" stepKey="clickHeading"/>
         <waitForElementVisible selector="{{section.formatOption(format.label)}}" stepKey="waitForFormatOptionVisible"/>
         <click selector="{{section.formatOption(format.label)}}" stepKey="clickFormatOption"/>
         <waitForElementNotVisible selector="{{section.formatOption(format.label)}}" stepKey="waitForFormatInvisible"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/GoToMediaGalleryFromTinyMCEImageModalActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/GoToMediaGalleryFromTinyMCEImageModalActionGroup.xml
index 889bf2c1d81..0a5d9cc4ddf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/GoToMediaGalleryFromTinyMCEImageModalActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/GoToMediaGalleryFromTinyMCEImageModalActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditTextAreaFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditTextAreaFromStageActionGroup.xml
index 1ac6afaf9cd..a314711243a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditTextAreaFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditTextAreaFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml
index 5b836297129..910a16f1f3b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InlineEditWYSIWYGFromStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
@@ -18,7 +18,7 @@
         </arguments>
         <click selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" stepKey="focusOnEditorArea"/>
         <waitForElementVisible selector="{{PageBuilderStage.inlineWYSIWYGEditorPanel(contentType.role, index)}}" stepKey="waitForEditorPanel"/>
-        <pressKey selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
+        <fillField selector="{{PageBuilderStage.inlineWYSIWYGEditor(contentType.role, index)}}" userInput="{{content}}" stepKey="enterContentIntoEditor"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForText userInput="{{content}}" stepKey="waitForContent"/>
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="loseFocusFromEditor"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGActionGroup.xml
index de666320a48..b5a4b33131c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGExistingTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGExistingTextActionGroup.xml
index 96ad5a469de..5f1dfdd16b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGExistingTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/InsertLinkInWYSIWYGExistingTextActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/OpenInlineWYSIWYGEditorOnStageActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/OpenInlineWYSIWYGEditorOnStageActionGroup.xml
index 546ec3b8a07..e1965453845 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/OpenInlineWYSIWYGEditorOnStageActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/OpenInlineWYSIWYGEditorOnStageActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ReplaceTextToTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ReplaceTextToTinyMCEActionGroup.xml
index 549fd5d38d7..603c5cd84c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ReplaceTextToTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ReplaceTextToTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ScrollToTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ScrollToTinyMCEActionGroup.xml
index 6e3b5afd1eb..f6e31e632ce 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ScrollToTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ScrollToTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeDirectiveFocusedTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeDirectiveFocusedTinyMCEActionGroup.xml
index 5ceb082a8b6..f492086f2c4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeDirectiveFocusedTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeDirectiveFocusedTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeVariableTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeVariableTinyMCEActionGroup.xml
index 899234bee60..5e425c9a228 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeVariableTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/SeeVariableTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ValidateTextInTinyMCEActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ValidateTextInTinyMCEActionGroup.xml
index ab61d19393c..d4740f5ecdd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ValidateTextInTinyMCEActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/ValidateTextInTinyMCEActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/VerifyInlineTinyMCEEditorNotUnderOtherElementsActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/VerifyInlineTinyMCEEditorNotUnderOtherElementsActionGroup.xml
index 7a3e5d649c3..e44f0a0b5dc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/VerifyInlineTinyMCEEditorNotUnderOtherElementsActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/VerifyInlineTinyMCEEditorNotUnderOtherElementsActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/WaitForTinyMCEInFocusActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/WaitForTinyMCEInFocusActionGroup.xml
index 34bbf8c2200..30208aaac12 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/WaitForTinyMCEInFocusActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/WYSIWYGActionGroup/WaitForTinyMCEInFocusActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTextActionGroup.xml b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/clickOutsideTextInlineEditingActionGroup.xml
similarity index 86%
rename from app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTextActionGroup.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/clickOutsideTextInlineEditingActionGroup.xml
index 442d7c92ba6..878413e0c0f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeTextActionGroup.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/clickOutsideTextInlineEditingActionGroup.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml
index 4b51b884b0d..4697352fc54 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/AdvancedData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml
index 4ae83cfe9d4..5042c4a2ba9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Background Color -->
@@ -200,18 +200,18 @@
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">#804042</data>
-        <data key="rgb">rgb(128, 64, 64)</data>
-        <data key="hex">#804040</data>
+        <data key="rgb">rgb(127, 63, 63)</data>
+        <data key="hex">#7f3f3f</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_CenterColorHueSlider" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">#40807f</data>
-        <data key="rgb">rgb(64, 128, 127)</data>
-        <data key="hex">#40807f</data>
+        <data key="rgb">rgb(63, 125, 127)</data>
+        <data key="hex">#3f7d7f</data>
         <data key="rgbaCenterOfLightDarkSlider">rgba(64, 128, 127, 0.5)</data>
-        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*128,\s*127,\s*0.49(\d+)\)</data>
+        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(63,\s*125,\s*127,\s*0.49(\d+)\)</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>
@@ -597,22 +597,22 @@
         <data key="name">Video URL</data>
         <data key="section">background</data>
         <data key="fieldName">video_source</data>
-        <data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
+        <data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
     </entity>
     <entity name="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded" type="pagebuilder_video_background_url">
         <data key="name">Video URL</data>
         <data key="section">background</data>
         <data key="fieldName">video_source</data>
-        <data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
+        <data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
     </entity>
     <entity name="PageBuilderVideoBackgroundUrl_YouTube_Insecure" type="pagebuilder_video_background_url">
         <data key="name">Video URL</data>
         <data key="section">background</data>
         <data key="fieldName">video_source</data>
-        <data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
+        <data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
     </entity>
     <entity name="PageBuilderVideoBackgroundUrl_Vimeo_Embedded" type="pagebuilder_video_background_url">
         <data key="name">Video URL</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml
index d628fe168ed..9eacfa9ac4a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/BannerData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Message Text -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/CatalogProductData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/CatalogProductData.xml
index 93e6e446e49..243385a30c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/CatalogProductData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/CatalogProductData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -64,4 +64,7 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="AssertCategoryConfigSavedMessage">
+      <data key="value">You saved the category.</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsConfigData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsConfigData.xml
index 9067f4b28e9..fb3a17712ce 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsConfigData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsConfigData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsPageData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsPageData.xml
index fc46f6b06c7..53bfa261539 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsPageData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/CmsPageData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml
index f4956198f93..443850791f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Appearance -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnGroupData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnGroupData.xml
index b68734df7ed..812982bd059 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnGroupData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ColumnGroupData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PageBuilderColumnGroupBorderWidth" type="pagebuilder_column_group">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml
index 002fde74d1d..9b3b176bb25 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/CommonContentTypeData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Min Height -->
@@ -44,6 +44,13 @@
         <data key="value">75</data>
         <data key="style">min-height: 75px</data>
     </entity>
+    <entity name="PageBuilderMinHeightProperty_150" type="pagebuilder_min_height_property">
+        <data key="name">Minimum Height</data>
+        <data key="section">appearance_fieldset</data>
+        <data key="fieldName">min_height</data>
+        <data key="value">150</data>
+        <data key="style">min-height: 150px</data>
+    </entity>
     <entity name="PageBuilderMinHeightProperty_500" type="pagebuilder_min_height_property">
         <data key="name">Minimum Height</data>
         <data key="section">appearance_fieldset</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml
index 5840e753864..2fc62caa0cf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ContentTypeData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -29,6 +29,12 @@
         <data key="role">column-group</data>
         <data key="pageNamePrefix">columns</data>
     </entity>
+    <entity name="PageBuilderColumnLineContentType" type="pagebuilder_content_type">
+        <data key="name">Column Line</data>
+        <data key="section">Layout</data>
+        <data key="role">column-line</data>
+        <data key="pageNamePrefix">column-line</data>
+    </entity>
     <entity name="PageBuilderColumnContentType" type="pagebuilder_content_type">
         <data key="name">Column</data>
         <data key="section">Layout</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/DividerData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/DividerData.xml
index fe7387fceeb..946dd4e78bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/DividerData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/DividerData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/EditPanelFormData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/EditPanelFormData.xml
index 8af4c288416..207b0d52d40 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/EditPanelFormData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/EditPanelFormData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/HeadingData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/HeadingData.xml
index f018899c678..5690d10f0c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/HeadingData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/HeadingData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml
index 28de2696267..9b4e70a1072 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/HtmlData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- HTML -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml
index 485f50aed72..738b9c76161 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ImageData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -64,6 +64,16 @@
         <data key="extension">jpg</data>
         <data key="path">wysiwyg</data>
     </entity>
+    <entity name="PageBuilderImagePropertyJpgCopyOtherFolder" type="pagebuilder_image_property">
+        <data key="name">Image</data>
+        <data key="section">general</data>
+        <data key="fieldName">image</data>
+        <data key="value">magento.jpg</data>
+        <data key="file">duplicatesamename/magento.jpg</data>
+        <data key="fileName">magento</data>
+        <data key="extension">jpg</data>
+        <data key="path">wysiwyg</data>
+    </entity>
     <entity name="PageBuilderBackgroundImagePropertyJpg" type="pagebuilder_image_property">
         <data key="name">Image</data>
         <data key="section">background</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/LinkData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/LinkData.xml
index e2d27b741e7..b79efc497d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/LinkData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/LinkData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml
index a130fbe5d88..1844970719c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/PageLayoutData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/PageLayoutData.xml
index d2a4cecc05e..c5f9e44641a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/PageLayoutData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/PageLayoutData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeData.xml
index 9f6d87b717f..f81cfea0063 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeSetData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeSetData.xml
index a826f79c590..54144d47f3e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeSetData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductAttributeSetData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml
index d000ea7a504..468077407e2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/RowData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/RowData.xml
index 77f6614c14d..38a14f8adbe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/RowData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/RowData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PageBuilderRowDefaultHeight" type="pagebuilder_row">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
index 02fbb9b8c84..64653fe9459 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/SlideData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml
index d79170ffb3c..fe74fba7950 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/SliderData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml
index 93083d73de7..7899cd50156 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/TabData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Tab Name -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TabsData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TabsData.xml
index 79014720f18..de9743ba41b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/TabsData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/TabsData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <entity name="PageBuilderFirstTabInStage" type="pagebuilder_column">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml
index 828fb45a120..5894ced14e2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/TemplateData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -82,6 +82,7 @@
             <item name="Magento_Cms::page">Magento_Cms::page</item>
             <item name="Magento_Cms::save">Magento_Cms::save</item>
             <item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
+            <item name="Magento_Widget::widget_instance">Magento_Widget::widget_instance</item>
         </array>
     </entity>
     <entity name="rolePageBuilderSaveTemplates" type="user_role" extends="adminRestrictedProductRole">
@@ -101,6 +102,7 @@
             <item name="Magento_Cms::save">Magento_Cms::save</item>
             <item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
             <item name="Magento_PageBuilder::template_save">Magento_PageBuilder::template_save</item>
+            <item name="Magento_Widget::widget_instance">Magento_Widget::widget_instance</item>
         </array>
     </entity>
     <entity name="rolePageBuilderApplyTemplates" type="user_role" extends="adminRestrictedProductRole">
@@ -120,6 +122,7 @@
             <item name="Magento_Cms::save">Magento_Cms::save</item>
             <item name="Magento_PageBuilder::templates">Magento_PageBuilder::templates</item>
             <item name="Magento_PageBuilder::template_apply">Magento_PageBuilder::template_apply</item>
+            <item name="Magento_Widget::widget_instance">Magento_Widget::widget_instance</item>
         </array>
     </entity>
     <entity name="rolePageBuilderDeleteTemplates" type="user_role" extends="adminRestrictedProductRole">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml
index 5287ac40497..d4b3e7969a7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/TextData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
     <!-- Text -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/TinyMCEData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/TinyMCEData.xml
index 919bea6f0d8..f2e7864dc56 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/TinyMCEData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/TinyMCEData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -114,9 +114,6 @@
         <data key="selection">t strin</data>
     </entity>
     <entity name="TinyMCEHeadingVariableTextSelection" type="pagebuilder_multiple_text_selection">
-        <data key="selection">his is a heading
-Base URL
-
-test strin</data>
+        <data key="selection">his is a headingBase URLtest strin</data>
     </entity>
 </entities>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml
index 81136370ea4..c29f7ade357 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Data/VideoData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -15,12 +15,19 @@
         <data key="fieldName">video_source</data>
         <data key="text">Video</data>
     </entity>
+    <entity name="PageBuilderVideoUrl_Cloud" type="pagebuilder_video_url_property">
+        <data key="name">Video URL</data>
+        <data key="section">general</data>
+        <data key="fieldName">video_source</data>
+        <data key="value">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
+        <data key="renderedValue">{{_CREDS.magento/PAGE_BUILDER_PUBLIC_VIDEO_URL}}</data>
+    </entity>
     <entity name="PageBuilderVideoUrl_YouTube" type="pagebuilder_video_url_property">
         <data key="name">Video URL</data>
         <data key="section">general</data>
         <data key="fieldName">video_source</data>
-        <data key="value">https://www.youtube.com/embed/slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="value">https://player.vimeo.com/video/2393127</data>
+        <data key="renderedValue">https://player.vimeo.com/video/2393127</data>
     </entity>
     <entity name="PageBuilder_InvalidVideoURL_Text" type="pagebuilder_video_url_property">
         <data key="name">Video URL</data>
@@ -40,8 +47,8 @@
         <data key="name">Video URL</data>
         <data key="section">general</data>
         <data key="fieldName">video_source</data>
-        <data key="value">https://www.youtube.com/watch?v=slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="value">https://player.vimeo.com/video/2393127</data>
+        <data key="renderedValue">https://player.vimeo.com/video/2393127</data>
     </entity>
     <entity name="PageBuilderVideoUrl_Empty" type="pagebuilder_video_url_property">
         <data key="name">Video URL</data>
@@ -54,8 +61,15 @@
         <data key="name">Video URL</data>
         <data key="section">general</data>
         <data key="fieldName">video_source</data>
-        <data key="value">http://www.youtube.com/watch?v=slOtnjsbff0</data>
-        <data key="renderedValue">https://www.youtube.com/embed/slOtnjsbff0</data>
+        <data key="value">https://player.vimeo.com/video/2393127</data>
+        <data key="renderedValue">https://player.vimeo.com/video/2393127</data>
+    </entity>
+    <entity name="PageBuilderVideoUrl_YouTube_Nocookie" type="pagebuilder_video_url_property">
+        <data key="name">Video URL</data>
+        <data key="section">general</data>
+        <data key="fieldName">video_source</data>
+        <data key="value">https://player.vimeo.com/video/2393127</data>
+        <data key="renderedValue">https://player.vimeo.com/video/2393127</data>
     </entity>
     <entity name="PageBuilderVideoUrl_Vimeo_Embedded" type="pagebuilder_video_url_property">
         <data key="name">Video URL</data>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Helper/SelectText.php b/app/code/Magento/PageBuilder/Test/Mftf/Helper/SelectText.php
index 9e7df0407df..4442f513391 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Helper/SelectText.php
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Helper/SelectText.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Test\Mftf\Helper;
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Page/PageBuilderTemplatesGridPage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Page/PageBuilderTemplatesGridPage.xml
index e571e655d5c..6c2d1985d47 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Page/PageBuilderTemplatesGridPage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Page/PageBuilderTemplatesGridPage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStoreConfigurationSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/ContentManagementSection.xml
similarity index 97%
rename from app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStoreConfigurationSection.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/Section/ContentManagementSection.xml
index f7bb452ebf8..e91a0a5a840 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStoreConfigurationSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/ContentManagementSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml
index 2fdc0d1e02f..0c6c9c43773 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnBackendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BannerOnBackend">
@@ -26,6 +26,8 @@
         <element name="bannerAltText" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@aria-label='{{arg2}}']" parameterized="true"/>
         <element name="bannerTitleAttribute" type="text" selector="(//div[@data-content-type='banner'])[{{arg1}}]//div[@title='{{arg2}}']" parameterized="true"/>
         <element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
+        <element name="uploadImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//div[@upload-area-id='background_image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
+        <element name="uploadNewImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//span[@upload-area-id='background_image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
         <element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-variable') and contains(@class, 'magento-placeholder')]" parameterized="true"/>
         <element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//*[contains(@class, 'magento-placeholder') and contains(@class, 'magento-widget')]" parameterized="true"/>
         <element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-banner')])[{{bannerIndex}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnConfigurationPanelSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnConfigurationPanelSection.xml
index 4d86cdc6b2d..1961b5fa529 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnConfigurationPanelSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnConfigurationPanelSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendEmptyLinkSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendEmptyLinkSection.xml
index e3cacf46cc2..d203de9fd1a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendEmptyLinkSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendEmptyLinkSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml
index 553f0f376dc..cdd0a9ae2e9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBannerSection/BannerOnFrontendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="BannerOnFrontend">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnFormSection.xml
index 528e8457de1..5a9b331ebf5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnGridSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnGridSection.xml
index 9ff29dcfb18..ca8d28a86c6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnGridSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnGridSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStageSection.xml
index ed6088a71ef..05118570606 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStorefrontSection.xml
index 91052023ba4..e616be6b812 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderBlockSection/BlockOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml
index 1813fad3739..1fe220e62d2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml
index b577e0995ed..b2e2fac1d09 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonGroupOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStageSection.xml
index 2fc889db63c..62e400bd118 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontEmptyLinkSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontEmptyLinkSection.xml
index e17c41c9093..309c16caeb0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontEmptyLinkSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontEmptyLinkSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontSection.xml
index 6fb2862d59f..69312342e25 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderButtonsSection/ButtonItemOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/AdminCategoryProductsGridSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/AdminCategoryProductsGridSection.xml
index fbb827e42bd..2550741d02b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/AdminCategoryProductsGridSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/AdminCategoryProductsGridSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/CategoryContentSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/CategoryContentSection.xml
index 69d82d39326..7041bb15d84 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/CategoryContentSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/CategoryContentSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderCategoryAttributeSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderCategoryAttributeSection.xml
index aac59578c27..52db47fd3ee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderCategoryAttributeSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderCategoryAttributeSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductAttributeSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductAttributeSection.xml
index 06f60ece913..17bbda8367b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductAttributeSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductAttributeSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductStorefrontSection.xml
index ab01b37291e..f6c1a757fd8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/PageBuilderProductStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontCategoryMainSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontCategoryMainSection.xml
index 21f5d96fed4..567d250058f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontCategoryMainSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontProductFullWidthSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontProductFullWidthSection.xml
index 43e68b57a43..5190ffc916f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontProductFullWidthSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderCatalogSection/StorefrontProductFullWidthSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnGroupSection/ColumnGroupOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnGroupSection/ColumnGroupOnFrontendSection.xml
index 676fde7ea16..0beab5b8f0a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnGroupSection/ColumnGroupOnFrontendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnGroupSection/ColumnGroupOnFrontendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnLineSection/ColumnLineOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnLineSection/ColumnLineOnBackendSection.xml
new file mode 100644
index 00000000000..e548651e38f
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnLineSection/ColumnLineOnBackendSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="ColumnLineOnBackend">
+        <element name="base" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]" parameterized="true"/>
+        <element name="bottomDropPlaceHolder" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]/div[contains(@class,&quot;bottom-dropper&quot;)]" parameterized="true"/>
+        <element name="topDropPlaceHolder" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]/div[contains(@class,&quot;top-dropper&quot;)]" parameterized="true"/>
+        <element name="childColumnDisplayLabel" type="button" selector="(//div[@data-content-type=&quot;column-line&quot;])[{{arg1}}]//div[contains(@class, &quot;pagebuilder-content-type&quot;) and  contains(concat(' ', @class, ' '), ' pagebuilder-column ')][{{arg2}}]/descendant::div[contains(@class, &quot;pagebuilder-display-label&quot;)][contains(text(), &quot;{{arg3}}&quot;)]" parameterized="true"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml
index 2b64dbeaf7d..12ec8652c2d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnBackendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="ColumnOnBackend">
@@ -12,7 +12,7 @@
         <element name="baseCSS" type="text" selector="[data-content-type=column][data-element=main]"/>
         <element name="elementChildren" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]/div[contains(@class,&quot;pagebuilder-column-inner&quot;)]/div[contains(@class,&quot;element-children&quot;)]" parameterized="true"/>
         <element name="columnConfigurationPath" type="text" selector="(//div[@data-content-type=&quot;column&quot;])[{{arg1}}]" parameterized="true"/>
-        <element name="columnChildrenConfigurationPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]/descendant::div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-column&quot;)][{{arg2}}]//div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
+        <element name="columnChildrenConfigurationPath" type="text" selector="(//div[contains(@class, &quot;pagebuilder-column-group&quot;)])[{{arg1}}]/descendant::div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(&quot; &quot;, @class, &quot; &quot;), &quot; pagebuilder-column &quot;)][{{arg2}}]//div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
         <element name="allColumns" type="text" selector="//div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')]"/>
         <element name="default" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-column')])[{{arg1}}][@style='border: {{arg2}}; border-radius: {{arg3}}px; margin: {{arg4}}px; padding: {{arg5}}px; width: {{arg6}}; background-size: {{arg7}}; background-repeat: {{arg8}}; background-attachment: {{arg9}}; align-self: {{arg10}};']" parameterized="true" deprecated="Styles are not inline"/>
         <element name="empty" type="button" selector="(//div[contains(@class,'empty-container')]//div[contains(@class,'element-children') and contains(@class,'column-container')])[{{arg1}}]" parameterized="true"/>
@@ -25,6 +25,7 @@
         <element name="columnGroupColumns" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[{{arg1}}]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')]" parameterized="true"/>
         <element name="column" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')][1]"/>
         <element name="columnX" type="text" selector=".pagebuilder-content-type.pagebuilder-column:nth-child({{arg1}})" parameterized="true"/>
+        <element name="columnXInColumnLineY" type="text" selector=".pagebuilder-content-type.pagebuilder-column-line:nth-child({{arg1}}) .pagebuilder-content-type.pagebuilder-column:nth-child({{arg2}})" parameterized="true"/>
         <element name="columnResizeHandle" type="block" selector=".pagebuilder-column-resize-handle"/>
         <element name="columnResizeGridLine" type="block" selector=".resize-grid .grid-line:nth-child({{arg}})" parameterized="true"/>
         <element name="columnStyle" type="text" selector="(//div[contains(@class, 'pagebuilder-column-group')])[1]/descendant::div[contains(@class, 'pagebuilder-content-type') and contains(concat(' ', @class, ' '), ' pagebuilder-column ')][{{arg1}}][contains(@style, '{{arg2}}')]" parameterized="true" deprecated="Styles are not inline"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnFrontendSection.xml
index 2bcc84f4255..e405cbb4498 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnFrontendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderColumnSection/ColumnOnFrontendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDataGridSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDataGridSection.xml
index fd608e899b9..fb99f1b67ef 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDataGridSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDataGridSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStageSection.xml
index 9e8347ea5c2..5dcb121f734 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStorefrontSection.xml
index 2b408e176c9..dcdf577dd33 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderDividerSection/DividerOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/AdvancedFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/AdvancedFormSection.xml
index 082a84a2853..26bdff39c92 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/AdvancedFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/AdvancedFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdvancedForm">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/ColorPickerSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/ColorPickerSection.xml
index a9e51a84564..6aa4527559e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/ColorPickerSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/ColorPickerSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml
index a91a77d5537..bbcbe076e32 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/EditPanelFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -20,6 +20,8 @@
         <element name="panelSectionError" type="text" selector="[data-index='{{arg1}}'] span._error .admin__page-nav-item-message-icon" parameterized="true"/>
         <element name="panelSectionGenericError" type="text" selector="div.message.message-error.error"/>
         <element name="panelFieldControl" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@name=&quot;{{arg2}}&quot;]" parameterized="true"/>
+        <element name="panelFieldControlWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{arg1}}&quot;]/descendant::*[@upload-area-id=&quot;{{arg2}}&quot;]//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]" parameterized="true"/>
+        <element name="panelFieldNameWithUploaderId" type="input" selector="//aside//div[@data-index=&quot;{{propertySection}}&quot;]/descendant::*[@upload-area-id=&quot;{{propertyField}}&quot;]" parameterized="true"/>
         <element name="panelFieldControlCheckbox" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}']" parameterized="true"/>
         <element name="panelFieldControlCheckboxState" type="input" selector="//input[@type='checkbox' and @name='{{arg1}}' and @value='{{arg2}}']" parameterized="true"/>
         <element name="panelFieldControlSwitch" type="input" selector="//*[@name='{{arg1}}']/parent::*/label" parameterized="true"/>
@@ -32,19 +34,25 @@
         <element name="panelFieldAfterLabelText" type="text" selector="//div[@data-index='{{arg1}}']//span[@data-bind='text: addafter' and .='{{arg2}}']" parameterized="true"/>
         <element name="panelFieldNoAfterLabelText" type="text" selector="//div[@data-index='{{arg1}}']//span[@data-bind='text: addafter']" parameterized="true"/>
         <element name="panelFieldHelperText" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-note') or contains(@class,'image-upload-requirements')]"/>
+        <element name="panelFieldHelperTextWithUploaderId" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-note') or contains(@class,'image-upload-requirements')]"/>
         <element name="panelFieldTooltip" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::a[contains(@class,'admin__field-tooltip-action')]"/>
+        <element name="panelFieldTooltipWithUploaderId" type="button" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::a[contains(@class,'admin__field-tooltip-action')]"/>
         <element name="panelFieldTooltipContent" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@name='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
-        <element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]" parameterized="true"/>
-        <element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-tinymce')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
+        <element name="panelFieldTooltipContentWithUploaderId" type="text" parameterized="true" selector="//aside//*[@data-index='{{section}}']/descendant::*[@upload-area-id='{{field}}']/ancestor::*[contains(@class,'admin__field-control')]/descendant::*[contains(@class,'admin__field-tooltip-content')]"/>
+        <element name="panelFieldValidationError" type="input" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}' and contains(@class,'_error')]//div[contains(@class,'')]//*[@name='{{arg2}}' or contains(@class,'tox-hugerte')][last()]" parameterized="true"/>
+        <element name="panelFieldValidationErrorMessage" type="button" selector="//div[contains(@class,'_insert_form')]//div[@data-index='{{arg1}}']//div[contains(@class,'admin__field-control')]//*[@name='{{arg2}}' or contains(@class,'tox-hugerte')][last()]//..//..//..//label[.='{{arg3}}']" parameterized="true"/>
         <element name="panelMultiSelectFieldControl" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] [data-role='advanced-select']" parameterized="true"/>
         <element name="panelMultiSelectFieldControlInput" type="input" selector="aside [data-index='{{arg1}}'] [data-index='{{arg2}}'] .admin__action-multiselect-search" parameterized="true"/>
         <element name="panelMultiSelectFieldControlResult" type="input" selector="//aside//div[@data-index='{{arg1}}']//div[@data-index='{{arg2}}']//div[contains(@class,'action-menu-item')]//span[.='{{arg3}}']" parameterized="true"/>
         <element name="editFormAllRequiredFields" type="text" selector="aside.pagebuilder_modal_form_pagebuilder_modal_form_modal ._required:not([style*='display: none;'])"/>
         <element name="editFormUploadedImage" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']/ancestor::*[contains(@class,'admin__field-control')]//img[@class='preview-image']" parameterized="true"/>
+        <element name="editFormUploadedImageWithUploaderId" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@upload-area-id='{{arg2}}']/ancestor::*[contains(@class,'admin__field-control')]//img[@class='preview-image']" parameterized="true"/>
         <element name="editFormNoUploadedImage" type="button" selector="//span[text()='{{arg1}}']//parent::label//following-sibling::div//p[text()='Browse to find or drag image here']" parameterized="true"/>
         <element name="editFormUploadedImageSource" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']/ancestor::*[contains(@class,'admin__field-control')]//img[contains(@src,'{{arg3}}') and contains(@src,'{{arg4}}')]" parameterized="true"/>
+        <element name="editFormUploadedImageSourceWithUploaderId" type="button" selector="//div[@data-index='{{arg1}}']/descendant::*[@upload-area-id='{{arg2}}']/ancestor::*[contains(@class,'admin__field-control')]//img[contains(@src,'{{arg3}}') and contains(@src,'{{arg4}}')]" parameterized="true"/>
         <element name="backgroundImagePreview" type="button" selector="//div[@data-index=&quot;background&quot;]/descendant::img[@class=&quot;preview-image&quot;]"/>
         <element name="selectFromGalleryBtn" type="button" selector="//aside//div[@data-index='{{arg1}}']/descendant::*[@name='{{arg2}}']//..//label[text()='Select from Gallery']" parameterized="true"/>
+        <element name="selectFromGalleryBtnWithUploaderId" type="button" selector="//aside//div[@data-index='{{arg1}}']/descendant::*[@upload-area-id='{{arg2}}']//..//label[text()='Select from Gallery']" parameterized="true"/>
         <element name="invalidUploadTitle" type="text" selector="//aside[contains(@class,'modal-popup')]//header/h1[contains(.,'Attention')]"/>
         <element name="invalidUploadMessage" type="text" selector="//aside[contains(@class,'modal-popup')]//div[@class='modal-content']//div[.=&quot;{{arg1}}&quot;]" parameterized="true"/>
         <element name="invalidUploadOkBtn" type="text" selector="//aside[contains(@class,'modal-popup')]//footer//button//span[.='OK']"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderLinkAttributeAdminSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderLinkAttributeAdminSection.xml
index 04ec63ddb8b..da8aec9c629 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderLinkAttributeAdminSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderLinkAttributeAdminSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderViewportFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderViewportFormSection.xml
index 000261db6d5..5080a8f55e8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderViewportFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/PageBuilderViewportFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/VisualSelectComponentSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/VisualSelectComponentSection.xml
index d208c6e00a6..b36db6b14c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/VisualSelectComponentSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderEditFormSection/VisualSelectComponentSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStageSection.xml
index 862e31b2855..cae5b2b9dd3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml
index e2644fa7bc6..5dbad3e173c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHeadingSection/HeadingOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="HeadingOnStorefront">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendArbitraryHtmlSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendArbitraryHtmlSection.xml
index 0742683c990..41c288f1e34 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendArbitraryHtmlSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendArbitraryHtmlSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendMediaDirectiveSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendMediaDirectiveSection.xml
index f10d344eaaa..ce8d4688a69 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendMediaDirectiveSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendMediaDirectiveSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendNonexistentDataRoleSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendNonexistentDataRoleSection.xml
index cec74fdf3a3..eb25e8271ab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendNonexistentDataRoleSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendNonexistentDataRoleSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendWithImageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendWithImageSection.xml
index b24cd16fa11..8c6526e3eb2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendWithImageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnBackendWithImageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnConfigurationSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnConfigurationSection.xml
index 9940033ebf3..2a8a20d3412 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnConfigurationSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnConfigurationSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnFrontendWithImageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnFrontendWithImageSection.xml
index e095c2eedef..3c2c3c201bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnFrontendWithImageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnFrontendWithImageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStageSection.xml
index 7fc35679266..858845b0790 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStorefrontSection.xml
index 43ee5df0123..cb38ef27e22 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderHtmlSection/HtmlOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnConfigurationPanelSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnConfigurationPanelSection.xml
index c6f871b7ef4..7671d84b942 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnConfigurationPanelSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnConfigurationPanelSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageSection.xml
index 7434ffed9f6..88be607b5c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml
index 11a806ec32f..5d27b6b0ca0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStageWithoutImageUploadedSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -12,6 +12,7 @@
         <element name="hidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]/ancestor::*[contains(@class, 'pagebuilder-content-type-wrapper') and contains(@class, 'pagebuilder-content-type-hidden')]" parameterized="true"/>
         <element name="notHidden" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]/parent::*[contains(@class, 'pagebuilder-content-type-wrapper') and not(contains(@class, 'pagebuilder-content-type-hidden'))][1]" parameterized="true"/>
         <element name="attachImageBtn" type="button" selector="//div[@class='pagebuilder-image-uploader-container']//input[@name='image']"/>
+        <element name="attachImageBtnWithUploaderId" type="button" selector="//div[@class='pagebuilder-image-uploader-container']//div[@upload-area-id='image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
         <element name="imageSourceByIndex" type="button" selector="(//div[contains(@class, 'pagebuilder-content-type') and contains(@class, 'pagebuilder-image')])[{{arg1}}]//img[contains(@src,'{{arg2}}')]" parameterized="true"/>
         <element name="imageEmptyPreview" type="text" selector="//div[contains(concat(' ', normalize-space(@class), ' '), ' pagebuilder-image-empty-preview ')]"/>
         <element name="imagePreview" type="text" selector="//img[contains(concat(' ', normalize-space(@class), ' '), ' preview-image ')]"/>
@@ -21,6 +22,8 @@
         <element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload New Image']" parameterized="true"/>
         <element name="uploadImageBtn" type="button" selector="//div[@class='pagebuilder-image-uploader-container']//label[text()='Upload Image']"/>
         <element name="uploadImageInput" type="button" selector="(//div[contains(@class,'pagebuilder-image-uploader-container')])[{{arg1}}]//input[@name='image']" parameterized="true"/>
+        <element name="uploadImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//div[@upload-area-id='image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
+        <element name="uploadNewImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//span[@upload-area-id='image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
         <!-- Advanced Configuration -->
         <element name="alignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[contains(@style,'text-align: {{arg2}};')]" parameterized="true"/>
         <element name="noAlignment" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-image')])[{{arg1}}]//figure[not(contains(@style,'text-align:'))]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStorefrontSection.xml
index 8873d09a641..d0e169a0602 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderImageSection/ImageOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/AddLocationFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/AddLocationFormSection.xml
index 9101c47e9f9..05052d237c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/AddLocationFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/AddLocationFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/EditMapFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/EditMapFormSection.xml
index 3f0bd25af4b..3689fd50fbc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/EditMapFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/EditMapFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStageSection.xml
index 8aa16e494c9..4ca9a71dd64 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStorefrontSection.xml
index 5de3b6053b6..a328d86e856 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderMapSection/MapOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/CatalogProductsWidgetSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/CatalogProductsWidgetSection.xml
index 2b11138929d..4d35d931789 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/CatalogProductsWidgetSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/CatalogProductsWidgetSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsCarouselOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsCarouselOnStageSection.xml
index 57f92157c0b..34a9956c714 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsCarouselOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsCarouselOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsContentTypeFormSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsContentTypeFormSection.xml
index 5fc26f6c2ce..44139b7125a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsContentTypeFormSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsContentTypeFormSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStageSection.xml
index 49c493c7ef4..965b166be08 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStorefrontSection.xml
index 555048eff15..62ca4e6b6c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderProductsSection/ProductsOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnBackendSection.xml
index f933b14cf79..d72ebec31d7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnBackendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnBackendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml
index e46c4d1b577..ddcc81dced6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="RowOnStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_ContainedSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_ContainedSection.xml
index 0c6cbc74c2b..f2cf0a835d3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_ContainedSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_ContainedSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_Contained_InvalidSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_Contained_InvalidSection.xml
index 552f8e30778..3b63478b219 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_Contained_InvalidSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStage_Contained_InvalidSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml
index e93b94f4f0e..b35bb6f6817 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="RowOnStorefront">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefront_FullWidth_FullBleedSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefront_FullWidth_FullBleedSection.xml
index 7ebaeacef80..873055683b2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefront_FullWidth_FullBleedSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderRowSection/RowOnStorefront_FullWidth_FullBleedSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml
index 8445fe22896..2f0c8862bf9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnBackendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -27,6 +27,8 @@
         <element name="optionsMenuButtonDisabled" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]//li[contains(@class,'pagebuilder-options-link')]//a[contains(@class,'{{buttonClass}}') and contains(@class,'disabled')]" parameterized="true"/>
         <element name="optionsMenuTitle" type="button" selector="(//div[contains(@class,'navigation-dot')])[{{navigationDotIndex}}]//li[contains(@class,'pagebuilder-options-link')]//div[contains(@class,'option-title')]" parameterized="true"/>
         <element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
+        <element name="uploadImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//div[@upload-area-id='background_image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
+        <element name="uploadNewImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//span[@upload-area-id='background_image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
         <element name="variablePlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{slideIndex}}]//*[contains(@class, 'magento-variable') and contains(@class, 'magento-placeholder')]" parameterized="true"/>
         <element name="widgetPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{slideIndex}}]//*[contains(@class, 'magento-placeholder') and contains(@class, 'magento-widget')]" parameterized="true"/>
         <element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-slide')])[{{slideIndex}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnConfigurationPanelSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnConfigurationPanelSection.xml
index b01c6f34f88..2ad71b8aa5a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnConfigurationPanelSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnConfigurationPanelSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendEmptyLinkSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendEmptyLinkSection.xml
index 16a99cc1347..2756c3a6edd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendEmptyLinkSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendEmptyLinkSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml
index b3cb03693c6..27a23a8260b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SlideOnFrontendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnFrontendSection.xml
index b2e24f1c0b4..e05ce7d547f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnFrontendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnFrontendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnStageSection.xml
index b99a2a52f2c..54dc6ab34a3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderSliderSection/SliderOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderContentTypeOptionsMenuSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderContentTypeOptionsMenuSection.xml
index 0f869e033b5..70eeb21173b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderContentTypeOptionsMenuSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderContentTypeOptionsMenuSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderPanelSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderPanelSection.xml
index 7ac6070e8b3..ba5bda1169a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderPanelSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderPanelSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml
index 0df9d0f0735..0ef36779c9c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStageSection/PageBuilderStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="PageBuilderStage">
@@ -40,16 +40,19 @@
         <element name="contentTypeLabelByText" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), ' pagebuilder-{{arg1}} ')]//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(., &quot;{{labelText}}&quot;)]" parameterized="true"/>
         <element name="contentTypeAffordanceLabelByText" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(@class, &quot;pagebuilder-affordance-{{contentType}}&quot;)]//div[contains(@class, &quot;pagebuilder-display-label&quot;) and contains(., &quot;{{labelText}}&quot;)]" parameterized="true"/>
         <element name="contentTypeInStageByIndex" type="button" selector="(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), &quot; pagebuilder-{{arg1}} &quot;)])[{{arg2}}]" parameterized="true"/>
+        <element name="childContentTypeInStageByIndex" type="button" selector="//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), &quot; pagebuilder-{{arg1}} &quot;)][{{arg2}}]" parameterized="true"/>
         <element name="contentTypeContainer" type="button" selector="(//div[contains(@class, &quot;pagebuilder-content-type&quot;) and contains(concat(' ', @class, ' '), ' pagebuilder-{{arg1}} ')])[{{arg2}}]/descendant::div[contains(@class, &quot;element-children&quot;)]" parameterized="true"/>
         <element name="contentTypeInsideContainerStage" type="button" selector="(//div[contains(@class, &quot;{{arg1}}-container&quot;)])[{{arg2}}]//div[contains(@class,&quot;pagebuilder-content-type-wrapper&quot;)][{{arg3}}]//div[contains(@class,&quot;pagebuilder-{{arg4}}&quot;)][{{arg5}}]" parameterized="true"/>
         <element name="contentTypePreviewInStage" type="button" selector="div.pagebuilder-{{arg1}}.pagebuilder-content-type" parameterized="true"/>
         <element name="computedHeightOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelectorAll('.pagebuilder-{{arg1}}')[{{arg2}}-1]).height)" parameterized="true"/>
         <element name="computedWidthOnStage" type="text" selector="return parseInt(window.getComputedStyle(document.querySelectorAll('.pagebuilder-{{arg1}}')[{{arg2}}-1]).width)" parameterized="true"/>
         <element name="uploadImageInput" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//input[@name='background_image']"/>
+        <element name="uploadImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//div[@upload-area-id='background_image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
+        <element name="uploadNewImageInputWithUploaderId" type="button" selector="//div[contains(@class,'pagebuilder-image-uploader-container')]//span[@upload-area-id='background_image']//div[contains(@class,'uppy-Root')]//input[contains(@class,'uppy-Dashboard-input')]"/>
         <element name="onHoverUploadImageButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//label[text()='Upload Image']" parameterized="true"/>
         <element name="onHoverSelectFromGalleryButton" type="button" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-{{arg1}}')])[{{arg2}}]//ul[contains(@class,'pagebuilder-options-links')]//label[text()='Select from Gallery']" parameterized="true"/>
         <element name="inlineWYSIWYGEditor" type="text" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'inline-wysiwyg')]|(//div[@data-content-type='{{arg1}}' and contains(@class,'inline-wysiwyg')])[{{arg2}}]" parameterized="true"/>
-        <element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-tinymce-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-tinymce-inline')]]" parameterized="true"/>
+        <element name="inlineWYSIWYGEditorPanel" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//div[contains(@class,'tox-hugerte-inline')]|(//div[@data-content-type='{{arg1}}'])[{{arg2}}][following-sibling::div[contains(@class,'tox-hugerte-inline')]]" parameterized="true"/>
         <element name="inlineTextAreaEditor" type="button" selector="(//div[@data-content-type='{{arg1}}'])[{{arg2}}]//textarea[@class='inline-wysiwyg-textarea']" parameterized="true"/>
         <element name="rootContainer" type="text" selector="(//div[contains(@class,&quot;pagebuilder-content-type&quot;) and contains(@class,&quot;pagebuilder-root-container&quot;)])[{{index}}]" parameterized="true"/>
         <element name="rootContainerPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-content-type') and contains(@class,'pagebuilder-root-container')])[{{index}}][contains(@class,'empty-container')]//div[contains(@class,'empty-placeholder')]" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderLinkAttributeStoreFrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderLinkAttributeStoreFrontSection.xml
index ac93979413e..e6da3779a84 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderLinkAttributeStoreFrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderLinkAttributeStoreFrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderStoreFrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderStoreFrontSection.xml
index 5a6a36452d8..98767c49a14 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderStoreFrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/PageBuilderStoreFrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/StorefrontPanelHeaderSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/StorefrontPanelHeaderSection.xml
index ddb0f430951..ec4f9d7bd94 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/StorefrontPanelHeaderSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderStorefrontSection/StorefrontPanelHeaderSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml
index fe94666e03b..4f082f3c117 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStorefrontSection.xml
index 39103141f7a..a92a07a8019 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnFrontendSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnFrontendSection.xml
index 8d9bc6406a1..c40b6fd523f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnFrontendSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnFrontendSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnStageSection.xml
index 7934f513b6a..0c14fed5598 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTabsSection/TabsOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplateSlideOutSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplateSlideOutSection.xml
index bd038073706..0e770e9c9be 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplateSlideOutSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplateSlideOutSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplatesGridSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplatesGridSection.xml
index c2610fe4e65..972bb69bfc0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplatesGridSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderApplyTemplatesGridSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderDeleteTemplateConfirmationModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderDeleteTemplateConfirmationModalSection.xml
index 52a884ad29d..400c4bbe95a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderDeleteTemplateConfirmationModalSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderDeleteTemplateConfirmationModalSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderPreviewImageModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderPreviewImageModalSection.xml
index a1b2d3e259f..9f313e2e592 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderPreviewImageModalSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderPreviewImageModalSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateConfirmationModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateConfirmationModalSection.xml
index deecf1a890b..502ec8e913f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateConfirmationModalSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateConfirmationModalSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateErrorModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateErrorModalSection.xml
index 6494db0f17b..9627e2c5eb9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateErrorModalSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateErrorModalSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateModalSection.xml
index 19a37918d61..5c0a373e9e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateModalSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderSaveTemplateModalSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageGridSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageGridSection.xml
index a9e02844f3d..cd2f75b8ed6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageGridSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageGridSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageSection.xml
index 0fe3cee6aab..76938bcfb22 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTemplateSection/PageBuilderTemplatesPageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnConfigurationSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnConfigurationSection.xml
index 35fcc7e16e8..44abe473743 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnConfigurationSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnConfigurationSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -19,6 +19,7 @@
         <element name="tinyMCEWidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
         <!-- WYSIWYG Disabled -->
         <element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
+        <element name="textAreaError" type="text" selector="//*[@id='pagebuilder_text_form_content']//ancestor::*[contains(@class,'admin__field-wide')]/*[contains(@class,'admin__field-error')]"/>
         <element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>
         <element name="insertWidgetButton" type="text" selector="//button[contains(@class,'action-add-widget')][.='Insert Widget...']"/>
         <element name="insertImageButton" type="text" selector="//button[contains(@class,'action-add-image')][.='Insert Image...']" timeout="10"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml
index 47679a0fe69..ecdb055ba02 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -26,6 +26,7 @@
         <element name="widgetPlaceholderJS" type="text" selector="(document.querySelectorAll('div.pagebuilder-text')[{{indexOfText}} - 1]).querySelector('.magento-placeholder.magento-widget')" parameterized="true"/>
         <element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
         <element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>
+        <element name="textAreaForExecuteJS" type="text" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg}}]//textarea[contains(@class,&quot;inline-wysiwyg-textarea&quot;)]" parameterized="true"/>
         <element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
         <element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
         <element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>
@@ -37,8 +38,8 @@
         <element name="inlineWYSIWYGEditorWithTag" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]//{{arg2}}" parameterized="true"/>
         <element name="wysiwyg" type="text" selector="(//div[@data-content-type='text'])[{{arg1}}]//div[contains(@class,'inline-wysiwyg')]" parameterized="true"/>
         <element name="contentJS" type="text" selector="document.querySelectorAll('div[data-content-type=text] .inline-wysiwyg')[{{arg1}} - 1]" parameterized="true"/>
-        <element name="headingsList" type="text" selector="div[title='Headings']"/>
-        <element name="heading1Style" type="text" selector="div[title='Heading 1']"/>
+        <element name="headingsList" type="text" selector="//div[contains(@aria-label,'Headings')]"/>
+        <element name="heading1Style" type="text" selector="//div[contains(@aria-label,'Heading 1')]"/>
         <element name="emptyTextInHeading1Style" selector="(//div[contains(@class,'pagebuilder-text')])[1]//h1" type="text" />
         <!-- Advanced Configuration -->
         <element name="advancedConfigurationPath" type="text" parameterized="true" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg1}}]/div[@data-pb-style]"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml
index 748c64c838d..71831ff77ee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStorefrontSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml
index 9b599473242..639b5369c47 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStageSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -17,6 +17,7 @@
         <element name="empty" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//video" parameterized="true"/>
         <element name="video" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video" parameterized="true"/>
         <element name="videoAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[contains(@autoplay,'true')]" parameterized="true"/>
+        <element name="videoNotAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[not(contains(@autoplay,'true'))]" parameterized="true"/>
         <element name="iframe" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//iframe" parameterized="true"/>
         <element name="icon" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//i[contains(@class,'icon-pagebuilder-video')]" parameterized="true"/>
         <element name="text" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{arg1}}]//span[.='{{arg2}}']" parameterized="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml
index a5b5cf859d7..59f9474f7f8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderVideoSection/VideoOnStorefrontSection.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="VideoOnStorefront">
         <element name="allVideo" type="text" selector="[data-content-type='video']"/>
+        <element name="videoWithPlaysinline" type="text" selector="video[playsinline=true]"/>
         <element name="mainCSS" type="text" selector="[data-content-type=video][data-element=main]"/>
         <element name="wrapperCSS" type="text" selector="[data-content-type=video] [data-element=wrapper]"/>
         <element name="main" type="text" selector="(//div[@data-content-type=&quot;video&quot;])[{{arg1}}]" parameterized="true"/>
@@ -24,6 +25,8 @@
         <element name="width" type="text" selector="(//div[@data-content-type='video'])[{{arg1}}]//div[@data-element='inner'][contains(@style,'max-width: {{arg2}}')]" parameterized="true"/>
         <element name="noWidth" type="text" selector="(//div[@data-content-type='video']//iframe)[{{arg1}}][not(starts-with(@style,'width:')) and not(contains(@style,' width:'))]" parameterized="true"/>
         <element name="videoElement" type="text" parameterized="true" selector="(//div[@data-content-type='video'])[{{videoIndex}}]//iframe|(//div[@data-content-type='row'])[{{videoIndex}}]//video"/>
+        <element name="videoNotAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[not(contains(@autoplay,'true'))]" parameterized="true"/>
+        <element name="videoAutoplay" type="text" selector="(//div[contains(@class,'pagebuilder-video-wrapper')])[{{videoIndex}}]//video[contains(@autoplay,'true')]" parameterized="true"/>
         <element name="iframePlaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'playing-mode')]" parameterized="true"/>
         <element name="iframeNotAutoplaying" type="text" selector="(//div[@id='player'])[{{playerIndex}}]//div[contains(@class, 'unstarted-mode')]" parameterized="true"/>
         <!-- Advanced Configuration -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderViewportSwitcherSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderViewportSwitcherSection.xml
index c3fa4b9c6e8..232d8974f37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderViewportSwitcherSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderViewportSwitcherSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/MediaGallerySection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/MediaGallerySection.xml
index 3db6d263f22..45ed188fa37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/MediaGallerySection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/MediaGallerySection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
index 0896569ce96..30c0bb180c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGInsertLinkModalSection.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -12,11 +12,11 @@
         <element name="title" type="input" selector="//div[@aria-label='Insert link']//div[contains(@id,'-title') and .='Insert link']"/>
         <element name="xButton" type="button" selector="[aria-label='Insert link'] button.mce-close"/>
         <element name="urlInput" type="input" selector="//div[@class='tox-dialog']//label[text()='URL']/..//input"/>
-        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@title='URL']"/>
+        <element name="browseMediaGalleryButton" type="button" selector="//div[@class='tox-dialog']//label[text()='URL']//..//button[@aria-label='Browse links']"/>
         <element name="textToDisplayInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Text to display']/..//input"/>
         <element name="titleInput" type="input" selector="//div[@class='tox-dialog']//label[text()='Title']/..//input"/>
         <element name="targetInput" type="input" selector="button[title='Open link in...']"/>
-        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@title='Save']"/>
+        <element name="okButton" type="button" selector="//div[@class='tox-dialog']//button[@aria-label='Save']"/>
         <element name="cancelButton" type="button" selector="//div[@aria-label='Insert link']//button//span[.='Cancel']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
index 1e97d96a531..883b7bd2795 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderInlineSection.xml
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="WYSIWYGOnPageBuilderInline">
-        <element name="toolbar" type="button" selector=".tox-tinymce.tox-tinymce-inline"/>
-        <element name="inlineCss" type="button" selector=".tox-tinymce.tox-tinymce-inline"/>
-        <element name="notCss" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline)"/>
-        <element name="undo" type="button" selector=".tox-tinymce-inline button[aria-label='Undo']"/>
-        <element name="redo" type="button" selector=".tox-tinymce-inline button[aria-label='Redo']"/>
-        <element name="formatSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Formats']"/>
-        <element name="fontSize" type="button" selector=".tox-tinymce-inline button[aria-label='Font sizes']"/>
-        <element name="lineHeight" type="button" selector=".tox-tinymce-inline button[aria-label='Line height']"/>
-        <element name="textColor" type="button" selector=".tox-tinymce-inline div[aria-label='Text color']"/>
-        <element name="backgroundColor" type="button" selector=".tox-tinymce-inline div[aria-label='Background color']"/>
-        <element name="bold" type="button" selector=".tox-tinymce-inline button[aria-label='Bold']"/>
-        <element name="italic" type="button" selector=".tox-tinymce-inline button[aria-label='Italic']"/>
-        <element name="underline" type="button" selector=".tox-tinymce-inline button[aria-label='Underline']"/>
-        <element name="alignLeft" type="button" selector=".tox-tinymce-inline button[aria-label='Align left']"/>
-        <element name="alignCenter" type="button" selector=".tox-tinymce-inline button[aria-label='Align center']"/>
-        <element name="alignRight" type="button" selector=".tox-tinymce-inline button[aria-label='Align right']"/>
-        <element name="numberedList" type="button" selector=".tox-tinymce-inline div[aria-label='Numbered list']"/>
-        <element name="bulletList" type="button" selector=".tox-tinymce-inline div[aria-label='Bullet list']"/>
-        <element name="insertLink" type="button" selector=".tox-tinymce-inline button[aria-label='Insert/edit link']"/>
-        <element name="imageSelector" type="button" selector=".tox-tinymce-inline button[aria-label='Insert/edit image']"/>
-        <element name="table" type="button" selector=".tox-tinymce-inline button[aria-label='Table']"/>
-        <element name="tableMenuFirstItem" type="text" selector="div[title='Table']"/>
+        <element name="toolbar" type="button" selector=".tox-hugerte.tox-hugerte-inline"/>
+        <element name="inlineCss" type="button" selector=".tox-hugerte.tox-hugerte-inline"/>
+        <element name="notCss" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline)"/>
+        <element name="undo" type="button" selector=".tox-hugerte-inline button[aria-label='Undo']"/>
+        <element name="redo" type="button" selector=".tox-hugerte-inline button[aria-label='Redo']"/>
+        <element name="formatSelector" type="button" selector=".tox-hugerte-inline button[aria-label='Format Paragraph']"/>
+        <element name="fontSize" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(1)"/>
+        <element name="fontSizeMinus" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(1)"/>
+        <element name="fontSizePlus" type="button" selector=".tox-hugerte-inline button[aria-label*='font size']:nth-of-type(2)"/>
+        <element name="lineHeight" type="button" selector=".tox-hugerte-inline button[aria-label='Line height']"/>
+        <element name="textColor" type="button" selector=".tox-hugerte-inline div[aria-label='Text color Black']"/>
+        <element name="backgroundColor" type="button" selector=".tox-hugerte-inline div[aria-label='Background color Black']"/>
+        <element name="bold" type="button" selector=".tox-hugerte-inline button[aria-label='Bold']"/>
+        <element name="italic" type="button" selector=".tox-hugerte-inline button[aria-label='Italic']"/>
+        <element name="underline" type="button" selector=".tox-hugerte-inline button[aria-label='Underline']"/>
+        <element name="alignLeft" type="button" selector=".tox-hugerte-inline button[aria-label='Align left']"/>
+        <element name="alignCenter" type="button" selector=".tox-hugerte-inline button[aria-label='Align center']"/>
+        <element name="alignRight" type="button" selector=".tox-hugerte-inline button[aria-label='Align right']"/>
+        <element name="numberedList" type="button" selector=".tox-hugerte-inline div[aria-label='Numbered list']"/>
+        <element name="bulletList" type="button" selector=".tox-hugerte-inline div[aria-label='Bullet list']"/>
+        <element name="insertLink" type="button" selector=".tox-hugerte-inline button[aria-label='Insert/edit link']"/>
+        <element name="imageSelector" type="button" selector=".tox-hugerte-inline button[aria-label='Insert/edit image']"/>
+        <element name="table" type="button" selector=".tox-hugerte-inline button[aria-label='Table']"/>
+        <element name="tableMenuFirstItem" type="text" selector="(//div[@class='tox-collection__group']//div[@role='menuitem' and contains(@class, 'tox-collection__item')])[1]"/>
         <element name="tableGrid" type="text" parameterized="true" selector="//div[@class='tox-insert-table-picker']//div[{{size}}]"/>
+        <element name="fontSizeValue" type="text" parameterized="true" selector="//*[@data-mce-style and contains(@style, '{{size}}')]"/>
         <element name="tableToolbar" type="text" selector=".tox-pop .tox-pop__dialog .tox-toolbar"/>
         <element name="tableProperties" type="button" selector="button[aria-label='Table properties']"/>
         <element name="deleteTable" type="button" selector="button[aria-label='Delete table']"/>
@@ -40,11 +43,12 @@
         <element name="insertColumnBefore" type="button" selector="button[aria-label='Insert column before']"/>
         <element name="insertColumnAfter" type="button" selector="button[aria-label='Insert column after']"/>
         <element name="deleteColumn" type="button" selector="button[aria-label='Delete column']"/>
-        <element name="specialCharacter" type="button" selector=".tox-tinymce-inline button[aria-label='Special character']"/>
-        <element name="insertWidget" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Widget']"/>
-        <element name="insertVariable" type="button" selector=".tox-tinymce-inline button[aria-label='Insert Variable']"/>
-        <element name="imageSelectorBrowse" type="button" selector="button[title='Source']"/>
+        <element name="specialCharacter" type="button" selector=".tox-hugerte-inline button[aria-label='Special character']"/>
+        <element name="insertWidget" type="button" selector=".tox-hugerte-inline button[aria-label='Insert Widget']"/>
+        <element name="insertVariable" type="button" selector=".tox-hugerte-inline button[aria-label='Insert Variable']"/>
+        <element name="imageSelectorBrowse" type="button" selector="button[aria-label='Browse files']"/>
         <element name="imageSelectorOk" type="button" selector="//div[contains(@aria-label, 'Insert/edit image')]//span[contains(@class, 'mce-txt')][text()='Ok']"/>
-        <element name="formatOption" type="text" parameterized="true" selector="//div[contains(@class, 'mce-menu')]//span[contains(@class, 'mce-text') and text()='{{label}}']"/>
+        <element name="formatOption" type="text" parameterized="true" selector="//div[contains(@aria-label,'{{label}}')]"/>
+        <element name="HeadSelector" type="text" selector="//div[contains(@aria-label,'Headings')]"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml
index 6fa35fd886e..1e9ac8b0ae4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderWYSIWYGSection/WYSIWYGOnPageBuilderSection.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
+
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="WYSIWYGOnPageBuilder">
-        <element name="undo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Undo']"/>
-        <element name="redo" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Redo']"/>
-        <element name="fontSize" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) button[aria-label='Font sizes']"/>
-        <element name="lineHeight" type="button" selector=".mce-tinymce:not(.mce-tinymce-inline) div[aria-label='Line Height']"/>
-        <element name="textColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Text color']"/>
-        <element name="backgroundColor" type="button" selector=".tox-tinymce:not(.tox-tinymce-inline) div[aria-label='Background color']"/>
-        <element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-tinymce') and not(contains(@class, 'tox-tinymce-inline'))]//span[text()='Paragraph']"/>
+        <element name="undo" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label='Undo']"/>
+        <element name="redo" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label='Redo']"/>
+        <element name="fontSize" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) button[aria-label*='font size']:nth-of-type(1)"/>
+        <element name="lineHeight" type="button" selector=".mce-hugerte:not(.mce-hugerte-inline) div[aria-label='Line Height']"/>
+        <element name="textColor" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) div[aria-label='Text color Black']"/>
+        <element name="backgroundColor" type="button" selector=".tox-hugerte:not(.tox-hugerte-inline) div[aria-label='Background color Black']"/>
+        <element name="formatSelector" type="button" selector="//div[contains(@class, 'tox-hugerte') and not(contains(@class, 'tox-hugerte-inline'))]//span[text()='Paragraph']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml b/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml
index dd43b482a5c..6af8418d869 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Section/TinyMCESection.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="TinyMCESection">
-        <element name="Style" type="button" selector="button[title='Formats']"/>
+        <element name="Style" type="button" selector="button[aria-label='Format Paragraph']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderDisabledSuite.xml b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderDisabledSuite.xml
new file mode 100644
index 00000000000..55b24d2b330
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderDisabledSuite.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
+  <suite name="PageBuilderDisabledSuite">
+    <before>
+      <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disblePageBuilder"/>
+      <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
+      <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+            <argument name="tags" value="config"/>
+        </actionGroup>
+    </before>
+    <after>
+      <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
+      <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
+      <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+            <argument name="tags" value="config"/>
+        </actionGroup>
+    </after>
+    <include>
+      <group name="pagebuilder_disabled"/>
+    </include>
+    <exclude>
+      <group name="pagebuilder"/>
+      <group name="pagebuilder-requiresValidMapAPIKey"/>
+      <group name="remote_storage_aws_s3_pagebuilder"/>
+    </exclude>
+  </suite>
+</suites>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml
index 7d5c41c662e..90207e03ec9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="PageBuilderNewMediaGalleryRenditionsSuite">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml
index 9c8285c949f..c7d0b655b7c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderRequiresValidGoogleMapsAPIKeySuite.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
+ */
 -->
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="PageBuilderRequiresValidGoogleMapsAPIKeySuite">
@@ -15,14 +15,18 @@
             <magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
             <magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
             <magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <include>
             <group name="pagebuilder-requiresValidMapAPIKey"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderWithWYSIWYGSuite.xml
similarity index 83%
rename from app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderWithWYSIWYGSuite.xml
index 8183d1cb383..759ec6c9f57 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderSuite.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Suite/PageBuilderWithWYSIWYGSuite.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="PageBuilderWithWYSIWYG">
@@ -15,14 +15,18 @@
             <magentoCLI command="config:set web/default_layouts/default_cms_layout cms-full-width" stepKey="setPageBuilderDefaultCmsLayout"/>
             <magentoCLI command="config:set web/default_layouts/default_category_layout category-full-width" stepKey="setPageBuilderDefaultCategoryLayout"/>
             <magentoCLI command="config:set web/default_layouts/default_product_layout product-full-width" stepKey="setPageBuilderDefaultProductLayout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <include>
             <group name="pagebuilder"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddImageToWYSIWYGBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddImageToWYSIWYGBlockTest.xml
index a5c20712cc7..d038ec9d01b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddImageToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddImageToWYSIWYGBlockTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddImageToWYSIWYGBlockTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddVariableToWYSIWYGBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddVariableToWYSIWYGBlockTest.xml
index 6e5da9b92ba..0ed27e18c81 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddVariableToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddVariableToWYSIWYGBlockTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddVariableToWYSIWYGBlockTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGBlockTest.xml
index 04072465b23..d5a3b1d7888 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGBlockTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGBlockTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
index 224fa7cce93..f766e87f299 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateCmsBlockWithMarginalSpaceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateCmsBlockWithMarginalSpaceTest.xml
index d3e550a1333..b3cf1c026a4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateCmsBlockWithMarginalSpaceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateCmsBlockWithMarginalSpaceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -11,11 +11,15 @@
     <test name="AdminCreateCmsBlockWithMarginalSpaceTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="adminLogout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateDuplicatedCmsBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateDuplicatedCmsBlockTest.xml
index 9d37260a603..1f6a86c8797 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateDuplicatedCmsBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateDuplicatedCmsBlockTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCreateDuplicatedCmsBlockTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="logout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/PageBuilderCmsBlockDisablePageBuilderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/PageBuilderCmsBlockDisablePageBuilderTest.xml
index 6874b106457..05243c26265 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/PageBuilderCmsBlockDisablePageBuilderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/PageBuilderCmsBlockDisablePageBuilderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -29,14 +29,18 @@
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <deleteData createDataKey="createPreReqBlock" stepKey="deleteCreatedProduct"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <seeElement selector="{{PageBuilderStage.stageWrapper}}" stepKey="seeElementPageBuilderStage"/>
         <dontSeeElementInDOM selector="{{CmsNewBlockBlockBasicFieldsSection.content_textarea}}" stepKey="dontSeeContentAreaInDOM"/>
         <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
-        <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+            <argument name="tags" value="config"/>
+        </actionGroup>
         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
             <argument name="CMSBlockPage" value="$$createPreReqBlock$$"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnBlockTest.xml
index 92662a37d73..4181e40d26e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnBlockTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="VerifyTinyMCEIsNativeWYSIWYGOnBlockTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockAddContentDirectlyToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockAddContentDirectlyToStageTest.xml
index 851db3ea518..7b8dd56cf29 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockAddContentDirectlyToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockAddContentDirectlyToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml
index 56883c4a0d0..0a47a1265ad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCMSBlockCreateAndApplyTemplate.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml
index 01dc55c3d6a..e4e66917ed6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockAddAndEditRowColumnSlideTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml
index 54b5723cba0..2f35ea6d8af 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenCoversEntireScreenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml
index 92ced023fb3..f4fa5ad2296 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockFullScreenLeftPanelHeightAndFunctionalityTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
index 14c8f54969f..e7f5d101ce1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
index 3bfba169a57..3cf9e955345 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
index 996be2e1334..0efff11c87e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
index e059c436db8..d3045786e7c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
index 0a118e60a48..ae9a0801388 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
index 8fd8a2a5837..c5e183a8d67 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
index 601b70afffa..8c7df61df38 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml
index fe577025a8f..0566441185a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveButtonItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
index a87cc7f99a9..4c1a591b4d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml
index f9c47712ff6..b67e81e47fe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveSlideItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml
index 97e79734552..93b68388e1a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyCanMoveTabItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml
index 766fffb933c..86135b58b37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockPageBuilderTest/PageBuilderCmsBlockVerifyPageBuilderEnableOnBlockPageWhenPageBuilderEnabledAndWYSIWYGDisabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddImageToWYSIWYGCMSTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddImageToWYSIWYGCMSTest.xml
index 2286448b16b..dde78151e38 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddImageToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddImageToWYSIWYGCMSTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddLargeImageToWYSIWYGCMSTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddLargeImageToWYSIWYGCMSTest.xml
index 1aca2f868c6..96047471fcd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddLargeImageToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddLargeImageToWYSIWYGCMSTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddRecentlyViewedProductWidgetToSeeProductPriceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddRecentlyViewedProductWidgetToSeeProductPriceTest.xml
new file mode 100644
index 00000000000..d53bf638df3
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddRecentlyViewedProductWidgetToSeeProductPriceTest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddRecentlyViewedProductWidgetToSeeProductPriceTest">
+        <before>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddVariableToWYSIWYGCMSTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddVariableToWYSIWYGCMSTest.xml
index cf7668d0a2e..b6f515e0c4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddVariableToWYSIWYGCMSTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddVariableToWYSIWYGCMSTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
index 7fdc6ab9869..c30b1206ce6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSPageLinkTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
index 8b2cf6ac84c..c73912c6c74 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogCategoryLinkTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
index 5c72c55eb41..cc3942f77fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductLinkTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
index 1c39649a1fa..f3aea307e64 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCatalogProductListTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
index 5a773c2d82e..5fbb20a7bf6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyComparedProductsTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
index 5c5408affad..eea4cf84204 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithRecentlyViewedProductsTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithTaxRuleForBundleProductInRecentlyViewedWidgetTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithTaxRuleForBundleProductInRecentlyViewedWidgetTest.xml
new file mode 100644
index 00000000000..e3c4ca75f6e
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithTaxRuleForBundleProductInRecentlyViewedWidgetTest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddWidgetToWYSIWYGWithTaxRuleForBundleProductInRecentlyViewedWidgetTest">
+        <before>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
+        </before>
+        <after>
+            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
+        </after>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateCmsPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateCmsPageTest.xml
index f2fe14a9883..621f63d0651 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateCmsPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateCmsPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateDuplicatedCmsPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateDuplicatedCmsPageTest.xml
index 185154a4562..493eff89c98 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateDuplicatedCmsPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminCreateDuplicatedCmsPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml
index f47e355a68e..aab5dcf44e4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/AdminMediaGalleryPopupUploadImagesWithoutErrorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckDisplayingOfApostrophesInTheTextFieldBoxWhileCreatingPageWidgetTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckDisplayingOfApostrophesInTheTextFieldBoxWhileCreatingPageWidgetTest.xml
new file mode 100644
index 00000000000..03d5d10c8cd
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckDisplayingOfApostrophesInTheTextFieldBoxWhileCreatingPageWidgetTest.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="CheckDisplayingOfApostrophesInTheTextFieldBoxWhileCreatingPageWidgetTest">
+        <annotations>
+          <features value="Widget"/>
+          <stories value="Checking displaying of apostrophes (') in the text field box while creating page widget"/>
+          <title value="Checking displaying of apostrophes (') in the text field box while creating page widget"/>
+          <description value="Checking displaying of apostrophes (') in the text field box while creating page widget"/>
+          <severity value="MAJOR"/>
+          <testCaseId value="AC-4389"/>
+          <group value="widget"/>
+          <group value="pagebuilder_disabled"/>
+        </annotations>
+      <before>
+        <!-- Pre-condition 1- Login as Admin  -->
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        <!-- Pre-condition 3- Verify page in grid-->
+        <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCMSPagesGridActionGroup"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescending"/>
+        <click selector="{{CmsPagesPageActionsSection.select('home')}}" stepKey="clickSelectCMSPage" />
+        <!-- Pre-condition 4- Update the page in grid-->
+        <click selector="{{CmsPagesPageActionsSection.edit('home')}}" stepKey="OpenThePageToBeEdited"/>
+        <waitForPageLoad stepKey="waitForPageLoadPostSelectingHomePage"/>
+        <waitForElementVisible selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForContentTabForPageToBeVisible"/>
+        <!-- Pre-condition 5- Expand the Content section > Insert Widget -->
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPage"/>
+        <conditionalClick selector="{{CmsNewPagePageActionsSection.showHideEditor}}" dependentSelector="{{CmsNewPagePageActionsSection.showHideEditor}}" visible="true" stepKey="clickOnShowHideEditorLinkIfVisibleForInsertingWidget"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.insertWidget}}" stepKey="waitForTheInsertWidgetButtonToDisplay"/>
+        <actionGroup ref="AdminInsertWidgetToCmsPageContentActionGroup" stepKey="selectCMSPageLinkFromDropdown"/>
+        <waitForPageLoad stepKey="waitForPageLoadPostSelectingFromDropDown"/>
+        <!-- Pre-condition 6 - 11 - Update the Anchor Custom Text -->
+        <fillField selector="{{WidgetSection.InputAnchorCustomText}}" userInput="Custom texts&apos; for tests" stepKey="InputValuesWithApostrophe"/>
+        <click selector="{{WidgetSection.SelectPageButton}}" stepKey="clickOnSelectPageButton"/>
+        <waitForElementVisible selector="{{WidgetSection.URLKeySelectPage}}" stepKey="waitForSelectPageDialogToPopulate"/>
+        <fillField selector="{{WidgetSection.URLKeySelectPage}}" userInput="home" stepKey="EnterThePageURL"/>
+        <click selector="{{WidgetSection.SearchButtonSelectPage}}" stepKey="clickOnSearchButton"/>
+        <waitForPageLoad stepKey="waitForResultsToBeDisplayed"/>
+        <click selector="{{WidgetSection.SearchResultSelectPage('home')}}" stepKey="clickOnDisplayedResult"/>
+        <click selector="{{WidgetSection.InsertWidget}}" stepKey="clickOnInsertWidget"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForInsertWidgetDialogToDisappear" time="5"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSavePage"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="waitForSuccessMessageLoggedOut" time="5"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessage"/>
+      </before>
+      <after>
+        <actionGroup ref="AdminOpenCMSPagesGridActionGroup" stepKey="openCMSPagesGridActionGroupToReset"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFiltersToReset"/>
+        <actionGroup ref="SortByIdDescendingActionGroup" stepKey="sortGridByIdDescendingToReset"/>
+        <click selector="{{CmsPagesPageActionsSection.select('home')}}" stepKey="clickSelectCMSPageToReset" />
+        <!-- Pre-condition 4- Update the page in grid To Reset-->
+        <click selector="{{CmsPagesPageActionsSection.edit('home')}}" stepKey="OpenThePageToBeEditedToReset"/>
+        <waitForPageLoad stepKey="waitForPageLoadPostSelectingHomePageToReset"/>
+        <waitForElementVisible selector="{{CmsNewPagePageContentSection.header}}" stepKey="waitForContentTabForPageToBeVisibleToReset"/>
+        <!-- Pre-condition 5- Expand the Content section > Insert Widget To Reset -->
+        <click selector="{{CmsNewPagePageContentSection.header}}" stepKey="clickExpandContentTabForPageToReset"/>
+        <conditionalClick selector="{{CmsNewPagePageActionsSection.showHideEditor}}" dependentSelector="{{CmsNewPagePageActionsSection.showHideEditor}}" visible="true" stepKey="clickOnShowHideEditorLinkIfVisibleForInsertingWidgetToOriginal"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.insertWidget}}" stepKey="waitForTheInsertWidgetButtonToDisplayToReset"/>
+        <clearField selector="{{CmsNewPagePageContentSection.content}}" stepKey="clearWidgetTextFieldToReset"/>
+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="&lt;p&gt;CMS homepage content goes here.&lt;/p&gt;" stepKey="InputDefaultValuesInWidgetTextFieldToReset"/>
+        <waitForElementVisible selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForInsertWidgetDialogToDisappearToReset" time="5"/>
+        <click selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="clickSavePageToReset"/>
+        <waitForElementVisible selector="{{CmsPagesPageActionsSection.savePageSuccessMessage}}" stepKey="waitForSuccessMessageLoggedOutToReset" time="5"/>
+        <see userInput="You saved the page." stepKey="seeSuccessMessageToReset"/>
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+      </after>
+      <actionGroup ref="StorefrontOpenHomePageActionGroup" stepKey="navigateToHomePage"/>
+      <waitForPageLoad stepKey="waitToLoadHomePage"/>
+      <grabTextFrom selector="{{StorefrontCMSPageSection.widgetContentApostrophe('Custom texts')}}" stepKey="grabContentFromWidget"/>
+      <assertEquals message="Asserts the widget contains apostrophe On storefront" stepKey="assertApostropheOnWidgetText">
+        <expectedResult type="string">Custom texts' for tests</expectedResult>
+        <actualResult type="string">{$grabContentFromWidget}</actualResult>
+      </assertEquals>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckOrderOfProdsInWidgetOnCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
index c285e13377f..de599065ef0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml
index 7cd6f5177a7..0fde28c723a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/PageBuilderCmsPageDisablePageBuilderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCMSPageTest.xml
index b553a357639..bc1dac64668 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPageDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
index ca978467b69..d5a3d8e138a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/AdminConfigDefaultCMSPageLayoutFromConfigurationSettingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-fullwidth"/>
             <group value="pagebuilder-cms-page"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <!-- PageBuilder is enabled so check default is full width -->
         <comment userInput="PageBuilder is enabled so check default is full width" stepKey="commentSeeFullWidth"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml
index 9e091342a5d..1c076d8949c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageAddContentDirectlyToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageContentValidationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageContentValidationTest.xml
index 714583ceeae..507b8f9c11c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageContentValidationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageContentValidationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -79,6 +79,17 @@
             <argument name="text" value="\u{1F600}"/>
         </actionGroup>
 
+        <click selector="{{EditPanelForm.editFormSave}}" stepKey="savePageBuilderTextContentType"/>
+        <waitForElementVisible selector="{{TextOnConfiguration.textAreaError}}" stepKey="waitForPageBuilderTextContentTypeError"/>
+        <grabTextFrom selector="{{TextOnConfiguration.textAreaError}}" stepKey="grabTextFromPageBuilderTextContentTypeError"/>
+        <assertStringContainsString stepKey="assertErrorMessageForPageBuilderTextContentType">
+            <expectedResult type="string">Please remove invalid characters</expectedResult>
+            <actualResult type="variable">grabTextFromPageBuilderTextContentTypeError</actualResult>
+        </assertStringContainsString>
+        <actionGroup ref="removeTextFromHtmlCodeWYSIWYGActionGroup" stepKey="removeTheInvalidCharacterFromPageBuilderTextContentType">
+            <argument name="selector" value="//textarea[@id=&quot;{{TextOnConfiguration.textAreaId}}&quot;][1]"/>
+            <argument name="text" value="\u{1F600}"/>
+        </actionGroup>
         <actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveTextEditPanelSettings"/>
 
         <!-- Validate Stage -->
@@ -90,6 +101,16 @@
             <expectedResult type="string">{{PageBuilderHtmlPropertyButton.value}}</expectedResult>
             <actualResult type="variable">actualTextFromHtmlCode</actualResult>
         </assertStringContainsString>
+
+        <!-- Add the invalid character in the text element on stage -->
+        <click selector="{{TextOnStage.textareaPlaceholder('1')}}" stepKey="focusOnEditorArea"/>
+        <actionGroup ref="addTextToHtmlCodeWYSIWYGActionGroup" stepKey="enterWrongTextContentOnStage">
+            <argument name="selector" value="{{TextOnStage.textAreaForExecuteJS('1')}}"/>
+            <argument name="text" value="\u{1F600}"/>
+        </actionGroup>
+        <!-- Trigger keyup to dispatch changes -->
+        <pressKey selector="{{TextOnStage.textareaPlaceholder('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::END]" stepKey="pressEndKey"/>
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromTextarea"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
 
         <!-- Cannot save invalid text-->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateAndApplyTemplate.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateAndApplyTemplate.xml
index 77bfb8c6837..9d7ac3db79f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateAndApplyTemplate.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateAndApplyTemplate.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml
index fc0c853ae4e..454f7ad964e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageFullWidthLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,8 @@
             <group value="pagebuilder-fullwidth"/>
             <group value="pagebuilder-cms-page"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
+	    <skip><issueId value="AC-10534"/></skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -41,6 +43,9 @@
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
             <argument name="contentType" value="PageBuilderRowContentType"/>
         </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceRow">
+            <argument name="property" value="PageBuilderRowAppearance_FullWidth"/>
+        </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterBackgroundColor">
             <argument name="property" value="PageBuilderBackgroundColor_HSV_Orange"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithInvalidFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithInvalidFullWidthLayoutTest.xml
index ae9019be9c4..df194c58aaf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithInvalidFullWidthLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithInvalidFullWidthLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-fullwidth"/>
             <group value="pagebuilder-cms-page"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreatePageWithImageTest.xml
similarity index 98%
rename from app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreatePageWithImageTest.xml
index ffa1203e36e..69e7632f079 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreatePageWithImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageBuilderEnableOnCMSPageWhenPageBuilderEnabledAndWYSIWYGEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageBuilderEnableOnCMSPageWhenPageBuilderEnabledAndWYSIWYGEnabledTest.xml
index a0f7d5b8451..33e1966209f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageBuilderEnableOnCMSPageWhenPageBuilderEnabledAndWYSIWYGEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageBuilderEnableOnCMSPageWhenPageBuilderEnabledAndWYSIWYGEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml
index 1f6015cbf99..d5e1f5a89bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -30,7 +30,7 @@
 
         <after>
             <!-- Delete Data -->
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/AdminAddImageToWYSIWYGCatalogTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/AdminAddImageToWYSIWYGCatalogTest.xml
index 9c2e316c8bf..5c15844054e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/AdminAddImageToWYSIWYGCatalogTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/AdminAddImageToWYSIWYGCatalogTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCatalogCategoryDisablePageBuilderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCatalogCategoryDisablePageBuilderTest.xml
index a346873a8a8..ca219ed3dc7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCatalogCategoryDisablePageBuilderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCatalogCategoryDisablePageBuilderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCategoryDisablePageBuilderContentPreviewTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCategoryDisablePageBuilderContentPreviewTest.xml
index 883270970c2..7871e70dc79 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCategoryDisablePageBuilderContentPreviewTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/PageBuilderCategoryDisablePageBuilderContentPreviewTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PageBuilderCategoryDisablePageBuilderContentPreviewTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml
index af8bebe8fde..72f45c683c9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnCatalogTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminAddCategoryDescriptionUsingPageBuilderEditorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminAddCategoryDescriptionUsingPageBuilderEditorTest.xml
new file mode 100644
index 00000000000..e053bc2e124
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminAddCategoryDescriptionUsingPageBuilderEditorTest.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * ADOBE CONFIDENTIAL
+ *
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAddCategoryDescriptionUsingPageBuilderEditorTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Catalog Category"/>
+            <title value="Category Description Can Be Added Using Page Builder Editor"/>
+            <description value="Validate admin can add category description using page builder editor when scope is set to storeview level"/>
+            <severity value="MINOR"/>
+            <testCaseId value="AC-11807"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-catalog-category"/>
+        </annotations>
+        <before>
+            <!--Step 1&2: Create Category-->
+            <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <!--Custom Store View -->
+            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
+                <argument name="customStore" value="NewStoreViewData"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <actionGroup ref="DeleteCustomStoreViewWithoutBackupActionGroup" stepKey="deleteCustomStoreView">
+                <argument name="storeViewName" value="{{NewStoreViewData.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <!--Step 3: Edit category in the backend on storeview level-->
+        <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedProductEditPage">
+            <argument name="Category" value="$$createPreReqCategory$$"/>
+        </actionGroup>
+        <actionGroup ref="SwitchCategoryStoreViewActionGroup" stepKey="SwitchStoreView">
+            <argument name="Store" value="NewStoreViewData.name"/>
+            <argument name="CatName" value="_defaultCategory.name"/>
+        </actionGroup>
+        <actionGroup ref="expandAdminCategorySection" stepKey="expandAdminCategorySection"/>
+        <!--Step 4: Untick the box 'Use default value' next to the category description field WYSWYG editor-->
+        <scrollTo selector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" x="0" y="-80" stepKey="scrollToDescription"/>
+        <conditionalClick selector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" dependentSelector="{{AdminCategoryContentSection.categoryDescriptionUseDefault}}" visible="true" stepKey="uncheckUseDefaultValueStoreView"/>
+        <scrollTo selector="{{PageBuilderProductAttribute.PageBuilderBtn('description')}}" x="0" y="-80" stepKey="scrollToPageBuilderbtn"/>
+        <!--Step 5: Enter a description in the WYSIWYG editor and assert the description-->
+        <actionGroup ref="openPageBuilderForAttribute" stepKey="openPageBuilderEditor"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
+            <argument name="contentType" value="PageBuilderHeadingContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingOntoStage">
+            <argument name="contentType" value="PageBuilderHeadingContentType"/>
+        </actionGroup>
+        <actionGroup ref="enterHeadingOnStage" stepKey="enterCatorgyDescriptionInPageBuilderEditor"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
+        <actionGroup ref="saveCatalogCategory" stepKey="saveCatalogCategory"/>
+        <actionGroup ref="AssertMessageInAdminPanelActionGroup" stepKey="seeCategorySavedSuccessMessage">
+            <argument name="message" value="{{AssertCategoryConfigSavedMessage.value}}"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
index ba634bda85a..991124052c5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/AdminConfigDefaultCategoryLayoutFromConfigurationSettingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-layout"/>
             <group value="pagebuilder-fullwidth"/>
             <group value="pagebuilder-catalog-category"/>
+            <group value="cloud"/>
         </annotations>
         <!-- PageBuilder is enabled so check default is full width -->
         <comment userInput="PageBuilder is enabled so check default is full width" stepKey="commentSeeCategoryFullWidth" before="seeNoLayoutUpdatesSelected"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryAddAndEditRowColumnSlideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryAddAndEditRowColumnSlideTest.xml
index 4a140557960..59c3b570fe3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryAddAndEditRowColumnSlideTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryAddAndEditRowColumnSlideTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateAndApplyTemplate.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateAndApplyTemplate.xml
index f751954bd08..01f2b3aa97c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateAndApplyTemplate.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateAndApplyTemplate.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml
index 3712888a015..b212e128012 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAndInvalidPageLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAppearanceTest.xml
index e9e1dedcc5d..7ded37be9e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionTest.xml
index 0055b6384c4..4e6c9937638 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryCreateCategoryWithPageBuilderDescriptionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryDirectivesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryDirectivesTest.xml
index 600d1757319..b60fec66ef9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryDirectivesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryDirectivesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -26,6 +26,9 @@
             <createData entity="simpleCmsPage" stepKey="createCMSPageA"/>
             <createData entity="simpleCmsPage" stepKey="createCMSPageB"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCategoryActionGroup" stepKey="navigateToCreatedProductEditPage">
                 <argument name="Category" value="$$createPreReqCategory$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderForAttribute" stepKey="enablePageBuilderOnCatalog"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenCoversEntireScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenCoversEntireScreenTest.xml
index fe2fd2cfbee..0f86d89d1f0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenCoversEntireScreenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenCoversEntireScreenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenLeftPanelHeightAndFunctionalityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenLeftPanelHeightAndFunctionalityTest.xml
index 20beb732254..617d538dc69 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenLeftPanelHeightAndFunctionalityTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryFullScreenLeftPanelHeightAndFunctionalityTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
index 48c2af9385f..8099dfd559e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
index e41a9ce7a72..6792b9e3761 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
index 088192f092e..675d2cd5da7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
index be96eba5949..926b5614508 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
index 0ad0d2befb9..ccbf3067a86 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
index eb16bcdd3bd..fea170aa325 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
index 6e3d67a16c9..ab926083c72 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveButtonItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveButtonItemsTest.xml
index 542623d1ad7..fc85b6be31b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveButtonItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveButtonItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
index 8e8674bfb6f..ddc81122ca8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveSlideItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveSlideItemsTest.xml
index 52cd644d2a4..8fde7a8eec5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveSlideItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveSlideItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveTabItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveTabItemsTest.xml
index e9606db830f..d16a0641308 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveTabItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCanMoveTabItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCategoryFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCategoryFullWidthLayoutTest.xml
index 4152f7b1065..9e5137cc4ca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCategoryFullWidthLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCategoryFullWidthLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -66,7 +66,7 @@
 
         <after>
             <!-- Delete Data -->
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyPageBuilderVisibleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyPageBuilderVisibleTest.xml
index 92500d2edb1..a91f13e8725 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyPageBuilderVisibleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyPageBuilderVisibleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCategoryAddContentDirectlyToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCategoryAddContentDirectlyToStageTest.xml
index 55bbd475e87..8dede220d50 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCategoryAddContentDirectlyToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCategoryAddContentDirectlyToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminAddImageToWYSIWYGProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminAddImageToWYSIWYGProductTest.xml
index c63d6eb917b..f350c2bb480 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminAddImageToWYSIWYGProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminAddImageToWYSIWYGProductTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminEditTextEditorProductAttributeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminEditTextEditorProductAttributeTest.xml
index 70e12edb00f..f28af024e95 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminEditTextEditorProductAttributeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/AdminEditTextEditorProductAttributeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderContentPreviewTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderContentPreviewTest.xml
index 093265d5938..8ded8cb92a1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderContentPreviewTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderContentPreviewTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PageBuilderProductDisablePageBuilderContentPreviewTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderTest.xml
index 8dbb1c8022a..9dcc6b63993 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/PageBuilderProductDisablePageBuilderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontBundleProductDetailsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontBundleProductDetailsTest.xml
index fd4ff76d640..ce98047ef0e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontBundleProductDetailsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontBundleProductDetailsTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="StorefrontBundleProductDetailsTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginToAdminPanel"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="logout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
deleted file mode 100644
index c166fa59730..00000000000
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="StorefrontSwatchAttributesDisplayInWidgetCMSTest">
-        <before>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
-        </before>
-        <after>
-            <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
-        </after>
-    </test>
-</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
index a5caf8dd617..a4ea91d73e8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyDefaultWYSIWYGToolbarOnProductTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="VerifyDefaultWYSIWYGToolbarOnProductTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <remove keyForRemoval="assertInfo2"/>
     </test>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnProductTest.xml
index 1a6b39ced08..13d6c578d95 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifyTinyMCEIsNativeWYSIWYGOnProductTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml
index 84dbc35de43..30467719309 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/VerifydefaultcontrolsonproductshortdescriptionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
index c481e2a82c9..8b71a65e7c6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminConfigDefaultProductLayoutFromConfigurationSettingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-layout"/>
             <group value="pagebuilder-fullwidth"/>
             <group value="pagebuilder-catalog-product"/>
+            <group value="cloud"/>
         </annotations>
         <seeOptionIsSelected selector="{{DefaultLayoutsSection.productLayout}}" userInput="{{PageBuilderFullWidthLayout.product}}" stepKey="seeDefaultProductLayout" after="DefaultProductLayout"/>
     </test>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminSimpleProductSetEditMetaDescriptionContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminSimpleProductSetEditMetaDescriptionContentTest.xml
new file mode 100644
index 00000000000..e6e4d869f1f
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/AdminSimpleProductSetEditMetaDescriptionContentTest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminSimpleProductSetEditMetaDescriptionContentTest">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Create/edit simple product"/>
+            <title value="Admin should be able to set/edit product Content when editing a simple product. Meta description should be autogenerated, based on updated mask with Page Builder installed."/>
+            <description value="Admin should be able to set/edit product Content when editing a simple product"/>
+            <severity value="MINOR"/>
+            <testCaseId value="AC-6971"/>
+            <group value="Catalog"/>
+            <group value="WYSIWYGDisabled"/>
+        </annotations>
+        <actionGroup ref="AssertMetaDescriptionInProductEditFormActionGroup" stepKey="seeProductMetaDescription">
+            <argument name="productMetaDescription" value="simple"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/HtmlAddToCatalogProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/HtmlAddToCatalogProductTest.xml
index d6cd5237729..b3bf57cbd64 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/HtmlAddToCatalogProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/HtmlAddToCatalogProductTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductAddAndEditRowColumnSlideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductAddAndEditRowColumnSlideTest.xml
index 883915cd052..925761bd2f9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductAddAndEditRowColumnSlideTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductAddAndEditRowColumnSlideTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml
index cc93dafa2f8..15545e35904 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeOnProductFormTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,12 +22,18 @@
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete all products via API using ProductApiHelper -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <amOnPage url="{{AdminProductCreatePage.url(AddToDefaultSet.attributeSetId, 'simple')}}" stepKey="navigateToNewProduct"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeTest.xml
index 78e514afda6..6a9d055f6b3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreatePageBuilderProductAttributeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-1321"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-productAttribute"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml
index 4d171fdfd23..6c7349ddbee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanCreateProductWithPageBuilderProductAttributeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,7 +22,9 @@
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <createData stepKey="myProductAttributeCreation" entity="productAttributeWysiwyg"/>
             <createData stepKey="myProductAttributeSetAssign" entity="AddToDefaultSet">
                 <requiredEntity createDataKey="myProductAttributeCreation"/>
@@ -30,8 +32,12 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete all products via API using ProductApiHelper -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml
index d14c12ca5a6..03bc55c340d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextAreaTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -28,6 +28,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete all products via API using ProductApiHelper -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml
index 65cc6f79de6..fe7c7f7ea9b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanDownGradePageBuilderProductAttributeToTextEditorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -28,6 +28,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete all products via API using ProductApiHelper -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="myProductAttributeCreation" stepKey="deletePreReqProductAttribute"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanUpgradeTextEditorProductAttributeToPageBuilderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanUpgradeTextEditorProductAttributeToPageBuilderTest.xml
index 2d685afb8d9..962f0f30d9a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanUpgradeTextEditorProductAttributeToPageBuilderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCanUpgradeTextEditorProductAttributeToPageBuilderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -28,6 +28,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete all products via API using ProductApiHelper -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="myProductAttributeCreation" stepKey="deleteProductAttribute"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateAndApplyTemplate.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateAndApplyTemplate.xml
index 78e0d211940..59bff40fab1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateAndApplyTemplate.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateAndApplyTemplate.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml
index 52430c66740..7d08510d528 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithFullWidthPageBuilderAttributeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -30,6 +30,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete product created via UI -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="createWysiwygAttribute" stepKey="deletePreReqProductAttribute"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml
index 7e7cd0f67f9..a6df2bbfbe0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithNormalAttributeValidateInTableFullWidthTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -29,6 +29,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete product created via UI -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="createTextAttribute" stepKey="deletePreReqProductAttribute"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
                 <argument name="indices" value=""/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml
index 68ad9029d85..4135755d0c4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionAndInvalidLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml
index fae170dfe30..447fc36c7a9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductCreateProductWithPageBuilderDescriptionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml
index 92f3767b0a6..e88e0625899 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -29,6 +29,9 @@
             <createData entity="simpleCmsPage" stepKey="createCMSPageA"/>
             <createData entity="simpleCmsPage" stepKey="createCMSPageB"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set general/store_information/country_id none" stepKey="setBackToDefaultValue"/>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!--Go to Product Page-->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenCoversEntireScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenCoversEntireScreenTest.xml
index ff4fb0dc876..c0ea9d34d94 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenCoversEntireScreenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenCoversEntireScreenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenLeftPanelHeightAndFunctionalityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenLeftPanelHeightAndFunctionalityTest.xml
index 1a1866266fd..bc9f90b8a72 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenLeftPanelHeightAndFunctionalityTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductFullScreenLeftPanelHeightAndFunctionalityTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml
index 5f97272d1f6..c0c3669575a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductProductFullWidthValidateAttributeOrderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -33,6 +33,8 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
+            <!-- Delete product created via UI -->
+            <helper class="Magento\Catalog\Test\Mftf\Helper\ProductApiHelper" method="deleteAllProductsApi" stepKey="deleteAllProductsViaApi"/>
             <deleteData createDataKey="createPageBuilderAttribute1" stepKey="deleteAttribute1"/>
             <deleteData createDataKey="createPageBuilderAttribute2" stepKey="deleteAttribute2"/>
             <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -128,7 +130,7 @@
         <waitForPageLoad stepKey="waitForAttributeSetGrid"/>
         <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="navigateToDefaultAttributeSet"/>
         <waitForPageLoad stepKey="waitForAttributeSetEditPage"/>
-        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute1.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('weight')}}" stepKey="dragFirstAttributeToWeight"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute1.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('price')}}" stepKey="dragFirstAttributeToWeight"/>
         <waitForPageLoad stepKey="waitForDragAndDrop"/>
         <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute2.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('status')}}" stepKey="dragSecondAttributeToStatus"/>
         <waitForPageLoad stepKey="waitForDragAndDrop2"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductRowCanAddAdditionalRowOnProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductRowCanAddAdditionalRowOnProductTest.xml
index c20fda81eb3..fd19213ee18 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductRowCanAddAdditionalRowOnProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductRowCanAddAdditionalRowOnProductTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml
index 6ebdd44af68..51c83fa8e05 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductStorefrontPageBuilderFullWidthProductsContentsAreOrderedCorrectlyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
index c31a05ab84a..6293c4ce6d2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanAddChildContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
index c307a417939..ce71bf221c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
index ae2b1f1653b..a52c0f6798a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDeleteContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
index 182073243e9..eedeba80f43 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
index 690e18f49ec..5b4a4d4bdb8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanDuplicateContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
index 4a143dbe02c..b518b481a72 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
index f1d06b80185..281b8139fab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanEditContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveButtonItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveButtonItemsTest.xml
index 2b13852235a..62d92625d04 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveButtonItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveButtonItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
index 090281fc795..4bf5d215ceb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveSlideItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveSlideItemsTest.xml
index 531823e8c23..637bdd4a862 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveSlideItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveSlideItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveTabItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveTabItemsTest.xml
index 2698ee40674..11a0889ce8c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveTabItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyCanMoveTabItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml
index fc1d72d6812..ebdc36c169a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -77,7 +77,7 @@
 
         <after>
             <!-- Delete Data & Revert Attribute -->
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteCreatedProduct1"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteCreatedProduct2"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderProductAddContentDirectlyToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderProductAddContentDirectlyToStageTest.xml
index 08abc2bb57b..681d905b338 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderProductAddContentDirectlyToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderProductAddContentDirectlyToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml
index 540d3cbf82e..d31a3b06dd0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderWorksForEachCatalogProductAttributeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml
index 735df8f5c08..208538d354c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest.xml
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest">
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" before="enableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="disableWYSIWYG"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enablePageBuilder">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml
index c6766be1ce2..0d272b9f03e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogCategoryContentSnapshotTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogProductContentSnapshotTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogProductContentSnapshotTest.xml
index 7085c4baa9e..ff8f963892c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogProductContentSnapshotTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCatalogProductContentSnapshotTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsBlockContentSnapshotTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsBlockContentSnapshotTest.xml
index 53b75612839..ad81d4eeafc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsBlockContentSnapshotTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsBlockContentSnapshotTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml
index b9c33870516..a15fd826585 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminContentSnapshot/PageBuilderCmsPageContentSnapshotTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssResponsiveStylingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssResponsiveStylingTest.xml
index bb6fcf26139..c3ebb97f11b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssResponsiveStylingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssResponsiveStylingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvancedConfigurationCssResponsiveStylingTest">
@@ -16,6 +16,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-advancedConfig"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssSpecificityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssSpecificityTest.xml
index ebed9d3f6aa..5c0d7dd13f1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssSpecificityTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationCssSpecificityTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdvancedConfigurationCssSpecificityTest">
@@ -16,6 +16,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-advancedConfig"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationEditPanelVisualTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationEditPanelVisualTest.xml
index cd616f664b8..f87d4e06a95 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationEditPanelVisualTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationEditPanelVisualTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAlignmentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAlignmentTest.xml
index dffd58574e5..30a74ac241d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAlignmentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAlignmentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2587"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAllAttributesTest.xml
index 8bf1dc26fff..383fd61a2d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder1Test.xml
index ffd636589ca..336ba5bdc51 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder2Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder2Test.xml
index 7c785a5f3a4..f03a00b707a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder2Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorder2Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderColorTest.xml
index 78546ad2dbf..62eabdf3dd4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderRadiusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderRadiusTest.xml
index 6cabfc62eab..fe180e4d586 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderRadiusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderRadiusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidth500Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidth500Test.xml
index 5d6c8c8bd0d..66f2cc6cbac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidth500Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidth500Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidthTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidthTest.xml
index 37e3d6ef5ec..95f22884b24 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidthTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalBorderWidthTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalCSSClassesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalCSSClassesTest.xml
index 1ee897e7f72..a290b474be9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalCSSClassesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalCSSClassesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMargins500Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMargins500Test.xml
index 24191aca44e..e1d07d15d5e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMargins500Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMargins500Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMarginsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMarginsTest.xml
index 50eb75fa293..2bccd6bbe1d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMarginsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalMarginsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPadding500Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPadding500Test.xml
index e72fd7125cf..d84a45d94c4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPadding500Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPadding500Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-3419"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPaddingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPaddingTest.xml
index 44ff93a1edc..6e2c8f89364 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPaddingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationFunctionalPaddingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderRadiusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderRadiusTest.xml
index 7db0735e1de..473e14a04bc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderRadiusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderRadiusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderWidthTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderWidthTest.xml
index b73e961d571..63d67a4d342 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderWidthTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidBorderWidthTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidMarginsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidMarginsTest.xml
index a786c8ebc94..502fa082e8c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidMarginsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidMarginsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidPaddingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidPaddingTest.xml
index f4731625d47..8b167106082 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidPaddingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationInvalidPaddingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationRemoveAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationRemoveAllAttributesTest.xml
index 43b1cf4e98b..dd153c9cdec 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationRemoveAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderAdvancedConfigurationTest/AdvancedConfigurationRemoveAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2319"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-advancedConfig"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml
index 79e2d2cf5f1..3a1658753d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml
index 69223c360ce..b737f125182 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorEmptyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorEmptyTest.xml
index f047ea857d3..6e9041418e1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorEmptyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorEmptyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSLTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSLTest.xml
index 8df0cbdfccf..40b7eaf7736 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSLTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSLTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSVTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSVTest.xml
index c6b0b1c7612..eafefe15c92 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSVTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHSVTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHexTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHexTest.xml
index 999858a5800..4e1f87ca540 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHexTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorHexTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorInvalidTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorInvalidTest.xml
index 8573da1b60e..0a7e15ac3ad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorInvalidTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorInvalidTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorPlainTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorPlainTextTest.xml
index 3bae7ffa0d1..3cd8c81f35a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorPlainTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorPlainTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBTest.xml
index 651a8105cc1..24b3065315a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBaTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBaTest.xml
index 4b864384f36..5e20ccccdba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBaTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundColorRGBaTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageGIFTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageGIFTest.xml
index 7ba681a79b1..f486de40b49 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageGIFTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageGIFTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileSizeTest.xml
index 1dbca09be09..bffb21b4923 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -38,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileTypeTest.xml
index 6b130ab98e7..9d3425708cb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidMimeTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidMimeTypeTest.xml
index 1cafa657afd..7c6332954d1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidMimeTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidMimeTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageJPGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageJPGTest.xml
index 362d0110780..9f765cc1f45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageJPGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageJPGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,8 +19,15 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -37,6 +44,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImagePNGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImagePNGTest.xml
index 9ff9a50036c..46e1e8ca30a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImagePNGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImagePNGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml
index 6f0bedb5759..64746edfb58 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
                 <argument name="Image" value="{{ImageFolder.name}}"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSpecialCharactersTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSpecialCharactersTest.xml
index 5d62f28a668..c40de5506b7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSpecialCharactersTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSpecialCharactersTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_SpecialCharacters"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml
index 8f212a693a3..9b56ecad651 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_GIF.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileSizeTest.xml
index 92e1a673686..84b0aff1301 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileTypeTest.xml
index 05c51f0b99b..172d899c969 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageJPGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageJPGTest.xml
index ddbc8659761..448d09886e6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageJPGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageJPGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImagePNGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImagePNGTest.xml
index 13db114cd5c..25912a627ac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImagePNGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImagePNGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_PNG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml
index 4e8f4b249fe..f0066468c1d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
             <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
@@ -43,6 +47,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
                 <argument name="Image" value="{{ImageFolder.name}}"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSpecialCharactersTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSpecialCharactersTest.xml
index 0cff8eb5037..16fe8f46bcb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSpecialCharactersTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSpecialCharactersTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_SpecialCharacters.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomCenterTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomCenterTest.xml
index 26c01f759f8..2ac7910dc89 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomCenterTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomCenterTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomLeftTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomLeftTest.xml
index 00a1e824286..141d0bb1310 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomLeftTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomLeftTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomRightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomRightTest.xml
index 0017cff5a82..57bb62bf3a4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomRightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomRightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterLeftTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterLeftTest.xml
index da1eeae20f6..e00aa82b148 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterLeftTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterLeftTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterRightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterRightTest.xml
index 79eb21ddb7a..04e6b20650f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterRightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterRightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterTest.xml
index c4a45d089b0..029d7f1d55f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopCenterTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopCenterTest.xml
index 4281c54440e..fb4372cabdb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopCenterTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopCenterTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopLeftTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopLeftTest.xml
index 0dd61dd6684..60ded7140ac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopLeftTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopLeftTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopRightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopRightTest.xml
index 448bb01f789..5baf6497d86 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopRightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopRightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatDisabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatDisabledTest.xml
index 0deccc9aba6..36d31dd3e23 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatDisabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatDisabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +40,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatEnabledTest.xml
index 9d1aba1ce89..2abd9bef7db 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeAutoTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeAutoTest.xml
index 0279197d5c6..131f01b5ea2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeAutoTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeAutoTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeContainTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeContainTest.xml
index b49d90ab123..93ba7301609 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeContainTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeContainTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeCoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeCoverTest.xml
index 49f6c07ecca..0ba403267fb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeCoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeCoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterAlignmentInheritanceTest.xml
index 12f33f3eb78..709b57fe420 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Fill Out Banner Edit Panel -->
         <comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonNeverShowTest.xml
index d7fb0d03755..aae7735835d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml
index 9b78fb559cd..bc9b7be17fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -85,7 +86,12 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
+        <moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
+        <wait time="5" stepKey="pause2"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +106,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
-        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
+        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerMobileStorefront"/>
+        <wait time="10" stepKey="pause3"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonsCanBeEditedInlineTest.xml
index 8422501864b..4aef4fc8251 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentTest.xml
index 95bd1777104..9f77bd956b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index ab2b904b384..76d00cd62ae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer2" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterHtmlValueInButtonsTest.xml
index 9574762a4d0..cf3c3d7781c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMinHeightValidInputs.xml
index bde1e096608..c2459299755 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithMobileImageValuesTest.xml
index b4a0f1662f1..0e4a6fc0c0c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithoutMobileImageValuesTest.xml
index ebf98fe14cd..ca8c794f8e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterNonBreakingSpaceValueInButtonsTest.xml
index b6579dd85e0..f4426a4d801 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayAndButtonOnHoverTest.xml
index f541be366e5..1778767377d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayNeverShowTest.xml
index 906511f5c8d..1e0951bf1c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayOnHoverTest.xml
index 93209c185eb..72f89f197bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayPositionTest.xml
index d409e80ff35..99d918eb4b3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAdvancedConfigurationValuesTest.xml
index 55719629758..eef740d3442 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml
index cb4ba362e31..2ebc75d8a16 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackground.xml
index 433d2c147b4..84b22fb1c19 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundFallbackImage.xml
index 785546c433e..26f10df8bb7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundNoFallbackImage.xml
index 5f058b5dc99..64568b3831b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterValidateVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index 774bd9b3015..fcba467557e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterWYSIWYGDisabledInlineEditTest.xml
index 3b43be94514..35ea12e6634 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml
index f1509e86b97..bc22cf40b1e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageCenteredAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageCenteredAppearanceTest.xml
index 4e1393b1a99..174329edea5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageCenteredAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageCenteredAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftAlignmentInheritanceTest.xml
index 34583396910..72aed90cf8a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Fill Out Banner Edit Panel -->
         <comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonNeverShowTest.xml
index e61cd01e8f1..eaedb4db7ce 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml
index e475921b527..e36cdf4b86e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -85,7 +86,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +104,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="10" stepKey="pause1StorefrontMobile"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonsCanBeEditedInlineTest.xml
index 734db092225..ad96e1774d2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentTest.xml
index 7177ad6867a..ce9012edf9d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index 625ec2c553d..9290d231497 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer2" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftHtmlValueInButtonsTest.xml
index d29b0cb6577..18c46101bf7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMinHeightValidInputs.xml
index bbea1dd4818..5e05354e720 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithMobileImageValuesTest.xml
index 5910d81a9ce..f3f644a472a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +33,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +47,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithoutMobileImageValuesTest.xml
index 95d48dd32dd..f322c08925e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftNonBreakingSpaceValueInButtonsTest.xml
index ed8625bfef8..327b0ea3e16 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayAndButtonOnHoverTest.xml
index b0bafca4dc0..6f05c4e3934 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayNeverShowTest.xml
index 475af979de6..017a5e968da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayOnHoverTest.xml
index 4a88518c046..0c89f7d07b1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayPositionTest.xml
index b72f0ff9903..93469e1f245 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAdvancedConfigurationValuesTest.xml
index aa8b7871533..b4906097be0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAllAttributesTest.xml
index 2d2dd25473d..8355861dfd9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackground.xml
index 6b432f07cd1..e011bf4cb91 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundFallbackImage.xml
index 3cdc30fe047..32ee159f228 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundNoFallbackImage.xml
index 30afb182865..aa2071bb914 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftValidateVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index 340bdaeb50b..c8e5d849934 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWYSIWYGDisabledInlineEditTest.xml
index d78acf0b273..b17eb8f9035 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml
index fe7c5243973..11120fb277c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderBannerContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml
index 3d9b9d5c4ac..72b64aeb3b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageLeftAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageLeftAppearanceTest.xml
index bed239acca5..a6c87a2058d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageLeftAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageLeftAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightAlignmentInheritanceTest.xml
index 40b2da9faaa..655b40b1ec0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Fill Out Banner Edit Panel -->
         <comment userInput="Fill Out Banner Edit Panel" stepKey="commentFillBannerEditPanel"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonNeverShowTest.xml
index 644074574d8..d4fcf8dd282 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml
index d2f090ecc25..6b7208a00e2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -30,7 +30,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -85,7 +85,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +103,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="10" stepKey="pause3"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonsCanBeEditedInlineTest.xml
index 28c5a0e35d5..964016723ea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentTest.xml
index 406032379ca..65042556d96 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index 60cdde522aa..4da318fd886 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer2" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightHtmlValueInButtonsTest.xml
index 52dfd174790..9753011130c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMinHeightValidInputs.xml
index 96344868274..95e4f1b58b1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithMobileImageValuesTest.xml
index 1477a2cf472..f9201d5f229 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithoutMobileImageValuesTest.xml
index 65deb768e4e..91e1b2e14a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightNonBreakingSpaceValueInButtonsTest.xml
index 004b8fee4c4..b60ce88b993 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayAndButtonOnHoverTest.xml
index a1deebc29e7..04046894d6d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayNeverShowTest.xml
index 7bd05a218cd..72e28f80e70 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayOnHoverTest.xml
index 43d3f558246..c1cce0209c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayPositionTest.xml
index 56b61fd5e72..dce7dc66a9e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAdvancedConfigurationValuesTest.xml
index f16671dfb8b..e8e9c3099f7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAllAttributesTest.xml
index 72ae0365456..5b1138c5abf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackground.xml
index 55aa87dcb45..f84fc0416a5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundFallbackImage.xml
index 97943566f75..b3c847b0920 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundNoFallbackImage.xml
index cec3d0372f2..70f4ea35f45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightValidateVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index fe7cf81098d..5437d0c282f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightWYSIWYGDisabledInlineEditTest.xml
index 0e148cab249..36ada970f87 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,11 +24,15 @@
             <remove keyForRemoval="enableWYSIWYG"/>
             <remove keyForRemoval="enableTinyMCE"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG" before="loginAsAdmin"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disableWYSIWYG"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disableWYSIWYG">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG" before="logout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enableWYSIWYG"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enableWYSIWYG">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <!-- Change Appearance -->
         <comment userInput="Change Appearance" after="dragContentTypeIntoContainer" stepKey="commentChangeAppearanceExtended"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml
index d7a400a213c..eee6fa051bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageRightAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageRightAppearanceTest.xml
index 8efee703f11..9b636dabd42 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageRightAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerOverlayDoesNotHaveBorderRadiusAppliedOnCollageRightAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerBackgroundImageInvalidFileTypeValidationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerBackgroundImageInvalidFileTypeValidationTest.xml
index ddc501caef5..c4a19aa21f2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerBackgroundImageInvalidFileTypeValidationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerBackgroundImageInvalidFileTypeValidationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
             <argument name="contentType" value="PageBuilderBannerContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddBannerTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddBannerTest.xml
index 36af3f2bda8..0363bee5ad6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddBannerTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddBannerTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddToColumnTest.xml
index 2cf5422b7df..b460584a02c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,7 @@
             <group value="pagebuilder-addToColumn"/>
             <group value="pagebuilder-bannerCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanOpenInNewTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanOpenInNewTabTest.xml
index 4f2a39d7028..78ec437a6cf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanOpenInNewTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanOpenInNewTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <closeTab stepKey="closeTab"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotAddToStageTest.xml
index 695b4ca4801..55b8cca0fe5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-bannerCommon"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml
index a58eee599ca..b09aea8face 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
index a32a6aefc98..d9592b6bfa5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentBlockDeleteImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentBlockDeleteImageTest.xml
index 2eb8e6dd04d..39446b04c7e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentBlockDeleteImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentBlockDeleteImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -23,6 +23,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -31,6 +34,9 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentVariableCanWrapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentVariableCanWrapTest.xml
index c8a55c0ab4e..3fa05e3246e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentVariableCanWrapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentVariableCanWrapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDeleteTest.xml
index d72f65ee7e4..9dde9fed1ae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDoesNotNavigateOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDoesNotNavigateOnStageTest.xml
index 14c7abd7a5d..1ef220546ab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDoesNotNavigateOnStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDoesNotNavigateOnStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -43,6 +47,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyBannerPreviewValidationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyBannerPreviewValidationTest.xml
index 720e8b5e4a9..ae779555e9f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyBannerPreviewValidationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyBannerPreviewValidationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyLinkURLDoesNothingOnStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyLinkURLDoesNothingOnStorefrontTest.xml
index ba4925c009b..cde774ba7d3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyLinkURLDoesNothingOnStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerEmptyLinkURLDoesNothingOnStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasButtonStyledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasButtonStyledTest.xml
index ff3c8f66d28..6a93c572aa8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasButtonStyledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasButtonStyledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml
index 918a95899a3..f798bc4a509 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasExpectedFieldsAndDefaultsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -61,10 +62,10 @@
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
             <argument name="property" value="PageBuilderBackgroundColor_Hex_White"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundImageProperty">
+        <actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeBackgroundImageProperty">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelField" stepKey="seeMobileImageProperty">
+        <actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeMobileImageProperty">
             <argument name="property" value="PageBuilderBackgroundMobileImage_GIF"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundPositionProperty">
@@ -111,7 +112,8 @@
         <actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeDefaultMinimumHeightProperty">
             <argument name="property" value="PageBuilderMinHeightProperty_300px"/>
         </actionGroup>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionDropdownValues"/>
+        <scrollTo selector="//div[@data-index='background']/descendant::*[@name='background_position']/option" stepKey="options"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" stepKey="grabBackgroundPositionDropdownValues"/>
         <assertEquals stepKey="assertPositionDropdown" message="Background Position in dropdown">
             <expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
             <actualResult type="variable">grabBackgroundPositionDropdownValues</actualResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasNoRequiredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasNoRequiredTest.xml
index 1f85f3161ff..40c327a67b0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasNoRequiredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerHasNoRequiredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWYSIWYGWidgetAndVariableStyleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWYSIWYGWidgetAndVariableStyleTest.xml
index 79ade94494c..9c92a706446 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWYSIWYGWidgetAndVariableStyleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWYSIWYGWidgetAndVariableStyleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWysiwygUploadImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWysiwygUploadImageTest.xml
index 29b7876527e..2d0f6eddffc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWysiwygUploadImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerInlineWysiwygUploadImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerMoveBannerTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerMoveBannerTest.xml
index a1cbbf40bea..e0fc77d2ae9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerMoveBannerTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerMoveBannerTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTextContainingPageBuilderMarkupWontBreakStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTextContainingPageBuilderMarkupWontBreakStageTest.xml
index 904020fdf1d..ca34848c2f0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTextContainingPageBuilderMarkupWontBreakStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTextContainingPageBuilderMarkupWontBreakStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,5 +38,15 @@
         <dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCode"/>
         <waitForElementVisible selector="{{BannerOnBackend.base('1')}}" stepKey="waitForBannerVisible"/>
         <seeElement selector="{{BannerOnBackend.messageContent('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeTestStringInBanner"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenDesktop"/>
+        <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageDesktop"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCodeAfterSave"/>
+        <waitForElementVisible selector="{{BannerOnBackend.base('1')}}" stepKey="waitForBannerVisibleAfterSave"/>
+        <seeElement selector="{{BannerOnBackend.messageContent('1', PageBuilderBannerMessageProperty.value)}}" stepKey="seeTestStringInBannerAfterSave"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTinyMCEMenuOpensInFrontOfVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTinyMCEMenuOpensInFrontOfVideoBackground.xml
index c7a6c5da0c7..54c72cd2d43 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTinyMCEMenuOpensInFrontOfVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerTinyMCEMenuOpensInFrontOfVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageFromStageTest.xml
index ed2908524c1..4c74e907e42 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
@@ -36,6 +39,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->
@@ -59,7 +65,7 @@
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
             <argument name="contentType" value="PageBuilderBannerContentType"/>
         </actionGroup>
-        <attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
+        <attachFile selector="{{PageBuilderStage.uploadImageInputWithUploaderId('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
             <argument name="section" value="BannerOnBackend"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageWithSecretKeyEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageWithSecretKeyEnabledTest.xml
index a44966b2802..d8e97459c0e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageWithSecretKeyEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageWithSecretKeyEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -26,6 +26,9 @@
             <!-- Create CMS Page, Add Banner to Row on Page -->
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -59,6 +62,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateAdvancedConfigurationDefaultValuesTest.xml
index 4849998a48e..04f62230a32 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateBackgroundSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateBackgroundSectionDefaultValuesTest.xml
index f95da18891b..b70b52a65f5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateBackgroundSectionDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateBackgroundSectionDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerBackground"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundAspectRatio.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundAspectRatio.xml
index 71b83d7f465..fe34bdf58c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundAspectRatio.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundAspectRatio.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopDisabled.xml
index ed7fe7d673d..31ca6961582 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopEnabled.xml
index af8b697f624..c76c4497fbf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadDisabled.xml
index 7954c1c6673..8e6c6358bc7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadEnabled.xml
index 64908b9d6b4..e21dddb4702 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundLazyLoadEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
index f0ae3371b3a..48cdb314cd7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
index d9946416d65..9bde23886fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundSectionDefaultValues.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundSectionDefaultValues.xml
index 71e5993f64f..46e31ce2d18 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundSectionDefaultValues.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundSectionDefaultValues.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -92,10 +92,10 @@
         <actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundVideoURLs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundVideoURLs.xml
index 486f047e3e6..68e8e114b40 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundVideoURLs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundVideoURLs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,9 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-backgroundForm"/>
             <group value="pagebuilder-video-background"/>
+            <skip>
+                <issueId value="AC-12669"/>
+            </skip>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyCanSwitchBackgroundTypes.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyCanSwitchBackgroundTypes.xml
index 06639300ea9..153fe6fb944 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyCanSwitchBackgroundTypes.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyCanSwitchBackgroundTypes.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -54,6 +57,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Set Background Image Attributes -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsForEachAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsForEachAppearanceTest.xml
index b40678f2776..71f3771929c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsForEachAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsForEachAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,9 @@
             <group value="pagebuilder-bannerCommon"/>
         </annotations>
         <before>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
@@ -31,9 +34,18 @@
                 <argument name="contentType" value="PageBuilderRowContentType"/>
                 <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
             </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanConfigCache">
+                <argument name="tags" value="config" />
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanConfigCache">
+                <argument name="tags" value="config" />
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsWorkWithVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsWorkWithVideoBackground.xml
index d1fcd2f939a..d03f97a7b65 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsWorkWithVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsWorkWithVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteBackgroundImage1">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml
index c90db7c09dd..7fe717a1bc5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerDefaultStateTest.xml
index 56247c07269..3fb481d67b6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCommon"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerTest.xml
index f5263a430fe..556f200eabf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/ValidateShowHideOnBannerTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-block"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
index 0226fc5236d..604fd07398e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BannerOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayHasConvertedBorderRadiusAppliedOnPosterAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayHasConvertedBorderRadiusAppliedOnPosterAppearanceTest.xml
index c8adf39f455..7e4afc50743 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayHasConvertedBorderRadiusAppliedOnPosterAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerOverlayHasConvertedBorderRadiusAppliedOnPosterAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAddWYSIWYGLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAddWYSIWYGLinkTest.xml
index 5fef66b32b8..c7b761ad168 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAddWYSIWYGLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAddWYSIWYGLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAlignmentInheritanceTest.xml
index d08066af6e5..a6ec0f4ef00 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml
index f4cf7d874d7..0e4b2f75d7d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -16,9 +16,10 @@
             <severity value="BLOCKER"/>
             <useCaseId value="MAGETWO-83553"/>
             <testCaseId value="MC-2692"/>
-            <group value="pagebuilder"/>
+	    <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml
index 6ff997ba304..f602f18f78c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -85,7 +86,12 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
+        <wait time="10" stepKey="pause1"/>
+        <moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonStorefront1"/>
+        <wait time="5" stepKey="pause2"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromBanner"/>
         <!-- Validate Storefront Mobile -->
@@ -100,7 +106,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideMobileStorefront"/>
+        <wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="10" stepKey="pause3"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonsCanBeEditedInlineTest.xml
index 6aa17503ac4..fcf722ffe4a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentTest.xml
index d9e0878708d..4a87daebf98 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index eeefc2c2429..9026448b8f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterHtmlValueInButtonsTest.xml
index 0e49f7aaa64..336d2bbbe5c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_Poster"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMinHeightValidInputs.xml
index de6205aebca..8375179b908 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithMobileImageValuesTest.xml
index 55972fdaff7..5ad7702c38d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +33,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +47,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithoutMobileImageValuesTest.xml
index a425fc0c330..d61e7e01d1c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterNonBreakingSpaceValueInButtonsTest.xml
index 6c8bc138662..36b54cde6ee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_Poster"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayAndButtonOnHoverTest.xml
index 74094e99139..ce7d38129d0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -112,8 +113,10 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
-        <waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
+        <wait time="10" stepKey="waitForTransitionStorefront"/>
         <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefront">
             <argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
@@ -145,9 +148,12 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
-        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
-        <waitForPageLoad time="30" stepKey="waitForTransitionStorefrontMobile"/>
-        <seeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="5" stepKey="waitForTransitionStorefrontMobile"/>
+        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
+        <wait time="5" stepKey="pause3"/>
+        <moveMouseOver selector="{{BannerOnFrontend.button('1')}}" stepKey="moveMouseOverBannerButtonMobileStorefront"/>
+        <wait time="5" stepKey="pause4"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefrontMobile">
             <argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
             <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.value}}"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayNeverShowTest.xml
index 07feac68e3b..8107fc594c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayOnHoverTest.xml
index 4f7fbcc7fad..f2387964528 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -79,8 +80,11 @@
             <argument name="contentType" value="PageBuilderBannerContentType"/>
         </actionGroup>
         <seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>
-        <waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
+        <wait time="5" stepKey="pause1"/>
+      <waitForPageLoad time="30" stepKey="waitForTransitionStorefront"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayBackgroundColorStorefront">
             <argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
             <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
@@ -92,11 +96,14 @@
         <resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
         <seeElement selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="seeAppearanceStorefrontMobile"/>
         <waitForPageLoad time="30" stepKey="waitForTransitionStorefrontMobile"/>
-        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverMobileStorefront"/>
+        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerMobileStorefront"/>
+        <wait time="5" stepKey="pause3"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayBackgroundColorStorefrontMobile">
-            <argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
-            <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
-            <argument name="cssProperty" value="backgroundColor"/>
-        </actionGroup>
+              <argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
+              <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
+              <argument name="cssProperty" value="backgroundColor"/>
+          </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayPositionTest.xml
index ab966c6f501..a4741eadda7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAdvancedConfigurationValuesTest.xml
index f3b145c218f..507400719a8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAllAttributesTest.xml
index 0dd3b7ce05d..12ec40575e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackground.xml
index 128ad80ec9b..48fc515f106 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundFallbackImage.xml
index be2b496b333..09f596a5a7f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundNoFallbackImage.xml
index 47e13dc9065..5c8759c03ad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index e63fdd192fb..8379022bd68 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWYSIWYGDisabledInlineEditTest.xml
index e9866cbf1b1..b4782e07beb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithBordersAndPaddingEqualToMinHeightTest.xml
index 9409713bc3b..a8e1bdbf8fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderBannerContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithMarginStaysInsideParentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithMarginStaysInsideParentTest.xml
index 3aed7521cb8..d5a7daa9dc3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithMarginStaysInsideParentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterWithMarginStaysInsideParentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderBlockThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderBlockThroughBlockContentTypeTest.xml
index 1b511ffd7fe..f01a1def6a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderBlockThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderBlockThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderDefaultProductsCarouselThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderDefaultProductsCarouselThroughBlockContentTypeTest.xml
index a57ae10d35b..632a6ca2c24 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderDefaultProductsCarouselThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderDefaultProductsCarouselThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml
index c73157666c9..77873cbd23c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateInfiniteLoopArrowsDotsFunctionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateInfiniteLoopArrowsDotsFunctionTest.xml
index 4224e8522d4..9216b1b02bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateInfiniteLoopArrowsDotsFunctionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselValidateInfiniteLoopArrowsDotsFunctionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml
index f1585a83218..990151e62fe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
index 10fb490a233..8de767f7db0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsThroughBlockContentTypeTest.xml
index 54a4f4c766e..d15a6dd48aa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/BlockRenderProductsThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/ProductFromDifferentWebsiteInsideBlockShowsOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/ProductFromDifferentWebsiteInsideBlockShowsOnStageTest.xml
index d247dcdd212..47d40140e3a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/ProductFromDifferentWebsiteInsideBlockShowsOnStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderAddContentContentTypesTest/ProductFromDifferentWebsiteInsideBlockShowsOnStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -37,7 +37,9 @@
                 <argument name="StoreGroup" value="customStoreGroup"/>
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <createData entity="SimpleProduct" stepKey="createProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
@@ -47,7 +49,9 @@
             <actionGroup ref="DeleteCustomWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="$createCustomWebsite.website[name]$"/>
             </actionGroup>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineNotSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineNotSameSizeTest.xml
index 120099854e7..c422b8155da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineNotSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineNotSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineSameSizeTest.xml
index 717a1c9bad9..09ad2bfde05 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeInlineSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
index e5e1eee3271..6cd1403ce62 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedSameSizeTest.xml
index 66c37c5d171..0a052f7b622 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderButtonsThroughBlockContentTypeStackedSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderDividerThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderDividerThroughBlockContentTypeTest.xml
index ff9a8bdd466..ac82cdc4952 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderDividerThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderDividerThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderDividerThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml
index aa53f742a85..113d8c43dee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -49,6 +52,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
                 <argument name="Image" value="{{ImageFolder.name}}"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add HTML -->
@@ -165,7 +171,7 @@
         <seeElement selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="seeRenderedHtmlCMSPageStorefront"/>
         <click selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="clickRenderedHtmlButtonCMSPageStorefront"/>
         <wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefront"/>
-        <seeCurrentUrlEquals url="{{PageBuilderHtmlPropertyButton.url}}" stepKey="seeThatUrlIsChangedToHtmlLinkUrl"/>
+        <seeCurrentUrlMatches regex="~^{{PageBuilderHtmlPropertyButton.url}}.*~" stepKey="seeThatUrlIsChangedToHtmlLinkUrl"/>
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHeadingThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHeadingThroughBlockContentTypeTest.xml
index e8c81f85bb7..c211375ce52 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHeadingThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHeadingThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
index 443a021a880..128bf4fb617 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
index bf6aeb83c84..8d535c7cf1f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
index 4c9800711b8..f998878c52e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -28,6 +28,9 @@
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -36,6 +39,9 @@
                 <argument name="contentType" value="PageBuilderRowContentType"/>
                 <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
             </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCaches">
+                <argument name="tags" value="config" />
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
@@ -53,6 +59,12 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCaches">
+                <argument name="tags" value="config" />
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Text -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/ButtonGroupInBlockOnDifferentLineWhenInFullWidthRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/ButtonGroupInBlockOnDifferentLineWhenInFullWidthRowTest.xml
index dc882f0b6dc..a9dfdb0563b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/ButtonGroupInBlockOnDifferentLineWhenInFullWidthRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/ButtonGroupInBlockOnDifferentLineWhenInFullWidthRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/TextHeightConsistencyBetweenContentTypeAndBlockOnStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/TextHeightConsistencyBetweenContentTypeAndBlockOnStorefrontTest.xml
index 2650fcff581..142d4c5493e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/TextHeightConsistencyBetweenContentTypeAndBlockOnStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/TextHeightConsistencyBetweenContentTypeAndBlockOnStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml
index d3f9e3ab305..9d8b5aa2287 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml
index 8fe8ab64c41..509d1311db1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml
index 53f9a968707..794abf7ce42 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderColumnDragAndDropMultipleColumnsResizingThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml
index b0203a956a0..186fc0bc290 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest">
@@ -21,10 +21,13 @@
             <group value="pagebuilder-column"/>
         </annotations>
         <before>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Columns -->
@@ -123,6 +129,7 @@
         <comment userInput="Validate CMS Block Stage" stepKey="commentValidateCMSBlockStage"/>
         <actionGroup ref="validateColumnAppearanceFullHeight" stepKey="validateColumn1AppearanceCMSBlockStage">
             <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
+            <argument name="acceptableOffset" value="3"/>
         </actionGroup>
         <actionGroup ref="ValidateAllBackgroundAttributesActionGroup" stepKey="validateBackgroundCMSBlockStage">
             <argument name="section" value="ColumnOnBackend"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml
index 922d9b6643e..ca15c8fc08a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderContainedRowMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderContainedRowMinHeightThroughBlockContentTypeTest.xml
index 2daf8c94709..d4775c61309 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderContainedRowMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderContainedRowMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderContainedRowMinHeightThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullBleedRowMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullBleedRowMinHeightThroughBlockContentTypeTest.xml
index eeacc5a9c07..9063efd2f0f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullBleedRowMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullBleedRowMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullWidthRowMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullWidthRowMinHeightThroughBlockContentTypeTest.xml
index c2a969931a2..ff7d8822f5c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullWidthRowMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderFullWidthRowMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceThroughBlockContentTypeTest.xml
index 93beb22fcb0..84605099f37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxThroughBlockContentTypeTest.xml
index a06f0437e26..14ebaca0069 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -36,7 +39,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -49,6 +52,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Edit Row -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
index e17703dde1e..11fd536adc5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithVideoBackgroundThroughBlockContentType.xml
index b3bab236e5a..1501f4d40f0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -26,6 +26,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceThroughBlockContentTypeTest.xml
index 5456aec78cf..23b54f58b2c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderRowFullBleedAppearanceThroughBlockContentTypeTest" extends="BlockRenderRowContainedAppearanceWithParallaxThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxThroughBlockContentTypeTest.xml
index 53001caaf56..ecd497a02a5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
index a9878b28b7d..88f603016ff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithVideoBackgroundThroughBlockContentType.xml
index 48e9e6bb90e..8d389ee6779 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullBleedAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceThroughBlockContentTypeTest.xml
index 53f42d1929c..aa004d31fb7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxThroughBlockContentTypeTest.xml
index 6178b2dd164..1fa67c87ef8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
index 31646e15d03..5f29d39fc44 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithParallaxVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithVideoBackgroundThroughBlockContentType.xml
index 85748a8de1f..ecf291ae891 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowFullWidthAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml
index f863f2a542e..cb593ee3f48 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderTabsThroughBlockContentTypeTest">
@@ -24,6 +24,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -34,7 +37,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Tabs -->
@@ -380,7 +386,7 @@
             <argument name="minHeight" value="{{PageBuilderTabsDefinedMinHeight.value}}"/>
             <argument name="index" value="2"/>
         </actionGroup>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
 
         <!-- Change Default Tab -->
         <comment userInput="Change Default Tab" stepKey="commentChangeDefaultTab"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContainedAppearanceHasEqualWidthToContentsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContainedAppearanceHasEqualWidthToContentsTest.xml
index 082429c6739..3857be1ae3d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContainedAppearanceHasEqualWidthToContentsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContainedAppearanceHasEqualWidthToContentsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContentIsVerticallyAlignedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContentIsVerticallyAlignedTest.xml
index 633f00e142e..c51ac4b6fb5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContentIsVerticallyAlignedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowContentIsVerticallyAlignedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRowContentIsVerticallyAlignedTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullBleedAppearanceHasEqualWidthToContentsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullBleedAppearanceHasEqualWidthToContentsTest.xml
index 99b1f4104d7..f82750e0fbc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullBleedAppearanceHasEqualWidthToContentsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullBleedAppearanceHasEqualWidthToContentsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullWidthAppearanceHasEqualWidthToContentsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullWidthAppearanceHasEqualWidthToContentsTest.xml
index 5b6a1dbb728..39c7a012195 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullWidthAppearanceHasEqualWidthToContentsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRowFullWidthAppearanceHasEqualWidthToContentsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockImageIsRightAlignedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockImageIsRightAlignedTest.xml
index 67b3358a382..405c70519c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockImageIsRightAlignedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockImageIsRightAlignedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockImageIsRightAlignedTest">
@@ -24,6 +24,9 @@
             <createData entity="_defaultBlock" stepKey="createCMSBlock"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Go to edit page of Block and configure Image -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index d0f9f65af37..3fce4cddede 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterMinHeightThroughBlockContentTypeTest.xml
index 74df8f24765..533f3c7ed49 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenterMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml
index d621b19a9c4..1475e3d92e6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderBannerCollageCenteredAppearanceThroughBlockContentTypeTest" extends="BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceThroughBlockContentTypeTest.xml
index bd466249231..f66770690bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderBannerCollageLeftAppearanceThroughBlockContentTypeTest" extends="BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index 58a7fcf6892..0e52193b2c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftMinHeightThroughBlockContentTypeTest.xml
index 1c2b5a57dc6..529820527be 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageLeftMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceThroughBlockContentTypeTest.xml
index c0d32087617..a0fa3e24568 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderBannerCollageRightAppearanceThroughBlockContentTypeTest" extends="BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index 953aeff30bb..1839e4c85bc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightMinHeightThroughBlockContentTypeTest.xml
index a73f7e9dab3..6750bc2297b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerCollageRightMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest.xml
index 881f64ffe56..a59a9a79462 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest">
@@ -25,6 +25,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -35,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -48,6 +51,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->
@@ -300,6 +306,8 @@
             <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColorDefaultProperty.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="moveMouseOverBannerCMSPageStorefront"/>
         <wait time="3" stepKey="waitAfterMouseOverBannerCMSPageStorefront"/>
         <waitForElementVisible selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefront"/>
@@ -354,6 +362,8 @@
             <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColorDefaultProperty.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerCMSPageStorefrontMobile"/>
         <wait time="3" stepKey="waitAfterMouseOverBannerCMSPageStorefrontMobile"/>
         <waitForElementVisible selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefrontMobile"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index ec04eecc06d..e7221ebfe54 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -26,6 +26,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterMinHeightThroughBlockContentTypeTest.xml
index d8e75afe553..55211c70db0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
index e23ad04b6c6..a37a509f9d2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
index 522127f6773..0a70776e216 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
index ae12715cf3d..d90ea1c066f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -29,6 +29,9 @@
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -54,6 +57,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderEmptyImageThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderEmptyImageThroughBlockContentTypeTest.xml
index 1a50090156f..85683c6b83d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderEmptyImageThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderEmptyImageThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderImageThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderImageThroughBlockContentTypeTest.xml
index 6778644d2ff..ef4e968a08c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderImageThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderImageThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -23,6 +23,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -35,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -51,6 +54,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Image -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderMapThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderMapThroughBlockContentType.xml
index 9ce41bd6610..2ce5473f170 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderMapThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderMapThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml
index 6763c82e8f5..45196bcfb23 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceWithVideoBackgroundThroughBlockContentType.xml
index fbc03b7cdee..09d869391c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageCenterAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceThroughBlockContentTypeTest.xml
index efb8d9b52b9..5c458410520 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentType.xml
index e26ccea66f3..f62aa81531d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceThroughBlockContentTypeTest.xml
index 21a7a51b913..a3b61752c18 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentType.xml
index 4f503233e1b..a9bcfb93cd5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml
index e1a523e0030..9883048595f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -26,6 +26,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -36,7 +39,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -49,6 +52,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
@@ -300,7 +306,9 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
-        <moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="moveMouseOverSlideCMSPageStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseSlideStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
+        <moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}"   x="50" y="50"  stepKey="moveMouseOverSlideCMSPageStorefront"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefront"/>
         <seeElement selector="{{SlideOnFrontend.buttonText('1', PageBuilderSlideItemButtonText_Common.value)}}" stepKey="seeButtonTextOnHoverCMSPageStorefront"/>
         <seeElement selector="{{SlideOnFrontend.buttonType('1', PageBuilderSlideItemButtonType_Secondary.value)}}" stepKey="seeButtonTypeOnHoverCMSPageStorefront"/>
@@ -353,6 +361,8 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseSlideStageOutsideStoreFrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStoreFrontMobile"/>
         <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideCMSPageStorefrontMobile"/>
         <waitForPageLoad time="30" stepKey="waitForSlideTransitionStorefrontMobile"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefrontMobile"/>
@@ -367,4 +377,4 @@
         <wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefrontMobile"/>
         <seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeThatUrlIsChangedToButtonUrlCMSPageStorefrontMobile"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceWithVideoBackgroundThroughBlockContentType.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceWithVideoBackgroundThroughBlockContentType.xml
index c78d1204aec..69012ca4912 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceWithVideoBackgroundThroughBlockContentType.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceWithVideoBackgroundThroughBlockContentType.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -26,6 +26,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider to Stage -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
index 63e5ba871cc..fd7039b5980 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
index 4c45170a0b0..f8cb3d6b40c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygDisabledCompletelyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
index 2c8040d0462..f28fbbbcfad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -29,6 +29,9 @@
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -54,6 +57,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageCenterSlideMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageCenterSlideMinHeightThroughBlockContentTypeTest.xml
index 5d9593faac8..43604896a11 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageCenterSlideMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageCenterSlideMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageLeftSlideMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageLeftSlideMinHeightThroughBlockContentTypeTest.xml
index 957ed68b1fb..7e6fef52870 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageLeftSlideMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageLeftSlideMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageRightSlideMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageRightSlideMinHeightThroughBlockContentTypeTest.xml
index 66508fbf614..21b218ce7ab 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageRightSlideMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithCollageRightSlideMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithPosterSlideMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithPosterSlideMinHeightThroughBlockContentTypeTest.xml
index a3bdb93cc98..d869949c74a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithPosterSlideMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderMinHeightWithPosterSlideMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderThroughBlockContentTypeTest.xml
index 4e7c651ec06..3755a7b0a6f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSliderThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockRenderSliderThroughBlockContentTypeTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderVideoThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderVideoThroughBlockContentTypeTest.xml
index 1252c83838f..2d1481d2e02 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderVideoThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderVideoThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/AddBlockToCmsPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/AddBlockToCmsPageTest.xml
index e7424b657ee..4baec4e6ccf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/AddBlockToCmsPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/AddBlockToCmsPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <useCaseId value="MC-1420"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-block"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCanAddToColumnTest.xml
index 6fe7228d7df..8f307115d4f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockCanAddToColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-block"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCannotAddToStageTest.xml
index df3c2167e7b..2919c4af63d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDeleteTest.xml
index eaa8b44f886..c6bdc1a0ddb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-block"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDuplicateTest.xml
index 00b0cd7a595..14ab8146f71 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockGetsUpdatedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockGetsUpdatedTest.xml
index ae1d2dd78fb..c6766fcc058 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockGetsUpdatedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockGetsUpdatedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockHiddenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockHiddenTest.xml
index c2e387acc9b..021e4840d76 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockHiddenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockHiddenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockMoveTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockMoveTest.xml
index 1d32d35a464..f3662bb7404 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockMoveTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockMoveTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockMoveTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockUpdateAdvancedConfigurationValuesTest.xml
index 3f5b2fbcd19..78591e160f5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateAdvancedConfigurationDefaultValuesTest.xml
index 578d9136379..be403cafac6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="BlockValidateAdvancedConfigurationDefaultValuesTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateEmptyStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateEmptyStateTest.xml
index 6354e0d4805..50e989e19fb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateEmptyStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/BlockValidateEmptyStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/DisplayingDeletedBlockOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/DisplayingDeletedBlockOnStageTest.xml
index e9c68905186..23aee82bc41 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/DisplayingDeletedBlockOnStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/DisplayingDeletedBlockOnStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockDefaultStateTest.xml
index 59c4adacf0d..29732b5a02c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockTest.xml
index af28c854694..3c8e7830422 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/ValidateShowHideOnBlockTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/VerifyBlockDisabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/VerifyBlockDisabledTest.xml
index ed4b8a99abd..e9ec50c67d8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/VerifyBlockDisabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockTest/VerifyBlockDisabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewLargestButtonWithSameSizeEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewLargestButtonWithSameSizeEnabledTest.xml
index 358be35d52f..1a926aa441c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewLargestButtonWithSameSizeEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewLargestButtonWithSameSizeEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewSmallerButtonWithSameSizeEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewSmallerButtonWithSameSizeEnabledTest.xml
index 5e4cb500ca6..7c61bdbdadb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewSmallerButtonWithSameSizeEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupCreateNewSmallerButtonWithSameSizeEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceDisableSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceDisableSameSizeTest.xml
index 23456dde1f4..fe6ccc86966 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceDisableSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceDisableSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceEnableSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceEnableSameSizeTest.xml
index d4cf29aed85..83bf1ff882d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceEnableSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupInlineAppearanceEnableSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectedByPaddingAndBorderWidthTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectedByPaddingAndBorderWidthTest.xml
index 9a44c2cb2a3..797d1c9945e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectedByPaddingAndBorderWidthTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectedByPaddingAndBorderWidthTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectsEmptyButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectsEmptyButtonsTest.xml
index 6ed44697d8d..c5ba67561b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectsEmptyButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupSameSizeAffectsEmptyButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceDisableSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceDisableSameSizeTest.xml
index 0493a28859c..df824ccb09d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceDisableSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceDisableSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceEnableSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceEnableSameSizeTest.xml
index 700067e2782..354c1b69ce4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceEnableSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupStackedAppearanceEnableSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderButtonGroupAppearance_Stacked"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupUpdateButtonTextWithSameSizeEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupUpdateButtonTextWithSameSizeEnabledTest.xml
index 4d426ec3c43..ce06aba7307 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupUpdateButtonTextWithSameSizeEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupUpdateButtonTextWithSameSizeEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateAppearanceDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateAppearanceDefaultValuesTest.xml
index 57504c07da4..be000db1630 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateAppearanceDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateAppearanceDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceAddButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceAddButtonTest.xml
index 7dbe6b5ff99..d7ab069df92 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceAddButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceAddButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceLongNameWrapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceLongNameWrapTest.xml
index 75d045b536f..c877e5e138a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceLongNameWrapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceLongNameWrapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceTest.xml
index 6381311ef37..99346bd90fb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateInlineAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForLinkButtonsInColumnResizingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForLinkButtonsInColumnResizingTest.xml
index b4d93948b6b..534dc169b55 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForLinkButtonsInColumnResizingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForLinkButtonsInColumnResizingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest.xml
index 1a5c361b9e3..38620d2727f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ButtonGroupValidateSameSizeForPrimaryButtonsInColumnResizingTest">
@@ -34,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <closeTab stepKey="closeTab"/>
@@ -131,7 +131,7 @@
             <expectedResult type="int">2</expectedResult>
             <actualResult type="variable">$buttonWidthMobileDifference</actualResult>
         </assertLessThanOrEqual>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop1"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop1"/>
         <!-- Resize Column: Large -->
         <comment userInput="Resize Column: Large" stepKey="commentResize1"/>
         <switchToPreviousTab stepKey="switchToPreviousTab"/>
@@ -191,7 +191,7 @@
             <expectedResult type="int">2</expectedResult>
             <actualResult type="variable">$buttonWidthMobileDifference2</actualResult>
         </assertLessThanOrEqual>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop2"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop2"/>
         <!-- Move Buttons to Small Column -->
         <comment userInput="Move Buttons to Small Column" stepKey="moveButtons"/>
         <switchToPreviousTab stepKey="switchToPreviousTab2"/>
@@ -247,6 +247,6 @@
             <expectedResult type="int">2</expectedResult>
             <actualResult type="variable">$buttonWidthMobileDifference3</actualResult>
         </assertLessThanOrEqual>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop3"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop3"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForSecondaryButtonsInColumnResizingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForSecondaryButtonsInColumnResizingTest.xml
index ba12997eb91..485f9319085 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForSecondaryButtonsInColumnResizingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeForSecondaryButtonsInColumnResizingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWhenSwitchingActiveTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWhenSwitchingActiveTabTest.xml
index f6fe2c682b1..215bd2174ff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWhenSwitchingActiveTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWhenSwitchingActiveTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,7 +20,6 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pagebuilder-tabs-content"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWithinTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWithinTabTest.xml
index ca6a87396c0..619e520ee96 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWithinTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWithinTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -34,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
@@ -117,6 +117,6 @@
             <expectedResult type="variable">$tabWidthStorefrontMobile</expectedResult>
             <actualResult type="variable">$buttonWidthStorefrontMobile</actualResult>
         </assertLessThanOrEqual>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop1"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop1"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWorksWhenSwitchingAppearancesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWorksWhenSwitchingAppearancesTest.xml
index f92ef400a63..cae809c6f95 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWorksWhenSwitchingAppearancesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSameSizeWorksWhenSwitchingAppearancesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceAddButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceAddButtonTest.xml
index 475644184c3..ab359188d59 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceAddButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceAddButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceTest.xml
index 227af4fdbf1..347511d4c4c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateStackedAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSwitchingAppearancesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSwitchingAppearancesTest.xml
index 869b8e6e9a5..345d00b332a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSwitchingAppearancesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupAppearanceTest/ButtonGroupValidateSwitchingAppearancesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDeleteTest.xml
index bc80d00e946..0d1a4abcde5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDuplicateTest.xml
index 780cdfe4424..e22255a9a1d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupNoMoreOldAddButtonButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupNoMoreOldAddButtonButtonTest.xml
index 7b42a269c9a..ccb4d5a22c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupNoMoreOldAddButtonButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupNoMoreOldAddButtonButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupOnDifferentLineWhenInFullWidthRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupOnDifferentLineWhenInFullWidthRowTest.xml
index 75d1a49c006..47a0b0e0909 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupOnDifferentLineWhenInFullWidthRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupOnDifferentLineWhenInFullWidthRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupRequiredAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupRequiredAttributesTest.xml
index 8083526ce2e..6befda820da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupRequiredAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupRequiredAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAdvancedConfigurationValuesTest.xml
index fb952b3a46e..07965020751 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAllAttributesTest.xml
index 16b59930e3d..09b851f359c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupValidateAdvancedConfigurationDefaultValuesTest.xml
index 08d6ff24d51..b910f15098d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonGroupValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCanAddToColumnTest.xml
index b061f280e60..62d9ccb10fe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ButtonsCanAddToColumnTest">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-buttonGroup"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCannotAddToStageTest.xml
index d0511393a93..47002d25ed3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ButtonsCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-buttonGroup"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsDefaultStateTest.xml
index 805c1b511f5..a4a1b8212a3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsOnStackedAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsOnStackedAppearanceTest.xml
index 3ec2d599f60..444965960a1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsOnStackedAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsOnStackedAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenu" after="dragButtonsIntoStage">
             <argument name="contentType" value="PageBuilderButtonItemContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsTest.xml
index 27c50cb1dbb..0b4e4ae922f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonGroupTest/ValidateShowHideOnButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemCommonCharactersButtonTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemCommonCharactersButtonTextTest.xml
index 3eed4b1382b..5a1d63270bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemCommonCharactersButtonTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemCommonCharactersButtonTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemEmptyButtonTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemEmptyButtonTextTest.xml
index 0af8f435a83..9367141965e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemEmptyButtonTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemEmptyButtonTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLinkButtonTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLinkButtonTypeTest.xml
index f3e0ef87f32..c5e9d482b45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLinkButtonTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLinkButtonTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLongButtonTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLongButtonTextTest.xml
index 4f3777377f8..305a8f19912 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLongButtonTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemLongButtonTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemOneCharacterButtonTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemOneCharacterButtonTextTest.xml
index d994d908738..fce19028f8b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemOneCharacterButtonTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemOneCharacterButtonTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemPrimaryButtonTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemPrimaryButtonTypeTest.xml
index 98b5719d349..d67a50f907c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemPrimaryButtonTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemPrimaryButtonTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSecondaryButtonTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSecondaryButtonTypeTest.xml
index d10f6826b85..70d875be500 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSecondaryButtonTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSecondaryButtonTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSpecialCharactersButtonTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSpecialCharactersButtonTextTest.xml
index 9345eb0b9cd..dc9ad0034ba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSpecialCharactersButtonTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemGeneralAttributeTest/ButtonItemSpecialCharactersButtonTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-buttonItemGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCanDeleteButtonAfterMovingButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCanDeleteButtonAfterMovingButtonTest.xml
index e10bae6ea46..9c1fae507ea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCanDeleteButtonAfterMovingButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCanDeleteButtonAfterMovingButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonOutsideButtonGroupTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonOutsideButtonGroupTest.xml
index e33190d6580..48180ac654f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonOutsideButtonGroupTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonOutsideButtonGroupTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ButtonItemCannotMoveButtonOutsideButtonGroupTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-moveButtons"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonToAnotherButtonGroupTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonToAnotherButtonGroupTest.xml
index b319b85bd7e..2994d255893 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonToAnotherButtonGroupTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemCannotMoveButtonToAnotherButtonGroupTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-moveButtons"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonBeforeButtonWithLongTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonBeforeButtonWithLongTextTest.xml
index b670934d503..9048ca3f280 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonBeforeButtonWithLongTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonBeforeButtonWithLongTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,10 +19,8 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-moveButtons"/>
-            <skip>
-                <issueId value="MQE-2288" />
-            </skip>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -81,7 +79,7 @@
         <actionGroup ref="moveButton" stepKey="moveButton">
             <argument name="buttonIndexToMove" value="2"/>
             <argument name="buttonIndexToMoveTo" value="1"/>
-            <argument name="y" value="-1000"/>
+            <argument name="y" value="0"/>
         </actionGroup>
         <!-- Stage: Validate Changed Button Order -->
         <comment userInput="Stage: Validate Changed Button Order" stepKey="commentValidateStage2"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonInlineAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonInlineAppearanceTest.xml
index cfa2c173217..181efb6966f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonInlineAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonInlineAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonStackedAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonStackedAppearanceTest.xml
index 09665a63121..1316d2182f2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonStackedAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonStackedAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-moveButtons"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonWhenInlineButtonsAreWrappingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonWhenInlineButtonsAreWrappingTest.xml
index 4fe73094d7b..9dfbbdbf311 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonWhenInlineButtonsAreWrappingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemMovingTest/ButtonItemMoveButtonWhenInlineButtonsAreWrappingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/AddButtonsContentTypeToCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/AddButtonsContentTypeToCMSPageTest.xml
index 5bf5b06d33e..021f42f02c6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/AddButtonsContentTypeToCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/AddButtonsContentTypeToCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanBeEditedInlineTest.xml
index 2a32fb6071b..a63977107f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanSaveButtonTextWithoutFocusingOutsideOfLiveEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanSaveButtonTextWithoutFocusingOutsideOfLiveEditTest.xml
index 43d4334073b..c0ee456903b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanSaveButtonTextWithoutFocusingOutsideOfLiveEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCanSaveButtonTextWithoutFocusingOutsideOfLiveEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCannotDeleteLastButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCannotDeleteLastButtonTest.xml
index 37a46b60e9c..360ca059bcf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCannotDeleteLastButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemCannotDeleteLastButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDeleteNoConfigurationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDeleteNoConfigurationTest.xml
index 58feb2b43df..460b28f5dcd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDeleteNoConfigurationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDeleteNoConfigurationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDuplicateTest.xml
index 2272ff06b07..b73d3b28453 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEditNonBreakingSpaceStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEditNonBreakingSpaceStageTest.xml
index 872d0e75abd..64f30a47d5e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEditNonBreakingSpaceStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEditNonBreakingSpaceStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEmptyLinkURLDoesNothingOnStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEmptyLinkURLDoesNothingOnStorefrontTest.xml
index 1fbc8dc62a8..0cb08be1925 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEmptyLinkURLDoesNothingOnStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemEmptyLinkURLDoesNothingOnStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHoverOverButtonItemShowsButtonGroupMenuTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHoverOverButtonItemShowsButtonGroupMenuTest.xml
index 40b08b9f8a9..ccdc86aac10 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHoverOverButtonItemShowsButtonGroupMenuTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHoverOverButtonItemShowsButtonGroupMenuTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHtmlValueInButtonsTest.xml
index 183033fa1e9..6a534defd6b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemMoveHandleDisabledWhenOnlyOneButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemMoveHandleDisabledWhenOnlyOneButtonTest.xml
index 0e0387e840e..47970e4a990 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemMoveHandleDisabledWhenOnlyOneButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemMoveHandleDisabledWhenOnlyOneButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemNoRequiredFieldsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemNoRequiredFieldsTest.xml
index 626e8315a36..892bb2b3992 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemNoRequiredFieldsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemNoRequiredFieldsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemUpdateAdvancedConfigurationValuesTest.xml
index a21309bc5b6..f41913aadd5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateAdvancedConfigurationDefaultValuesTest.xml
index 5c8a3e4d6a1..c65abab88bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateGeneralSectionFieldsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateGeneralSectionFieldsTest.xml
index 0dfd86344c4..318e455fa93 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateGeneralSectionFieldsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ButtonItemValidateGeneralSectionFieldsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/EmptyButtonItemTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/EmptyButtonItemTest.xml
index e09daec66b4..36dfe264afc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/EmptyButtonItemTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/EmptyButtonItemTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-buttonItem"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ValidateButtonItemNotHideableTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ValidateButtonItemNotHideableTest.xml
index cb6906647e4..a7515185d12 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ValidateButtonItemNotHideableTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderButtonItemTest/ValidateButtonItemNotHideableTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-buttonItem"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml
index c3501b87741..0c121e9224e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnValidateBackgroundFormTest">
@@ -18,9 +18,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnBackground"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -29,7 +33,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToDesktopImageFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -40,6 +44,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml
index 01d713767bf..3fe33c30238 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundSectionDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnValidateBackgroundSectionDefaultValuesTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnBackground"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnDragColumnWithContentBetweenColumnGroupsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnDragColumnWithContentBetweenColumnGroupsTest.xml
index 4f90e398850..70a15926508 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnDragColumnWithContentBetweenColumnGroupsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnDragColumnWithContentBetweenColumnGroupsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnDragColumnWithContentBetweenColumnGroupsTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnsMoveContentBetweenColumnsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnsMoveContentBetweenColumnsTest.xml
index afe83cf39d3..728e819c07a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnsMoveContentBetweenColumnsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/ColumnsMoveContentBetweenColumnsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-row"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/MoveContentIntoEmptyTallColumnGroupTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/MoveContentIntoEmptyTallColumnGroupTest.xml
index a7ee01a11b9..cd40d79503e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/MoveContentIntoEmptyTallColumnGroupTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/MoveContentIntoEmptyTallColumnGroupTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="MoveContentIntoEmptyTallColumnGroupTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml
index a8fe198cc4a..90e0d9ef8e1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnAndHeightAdjustsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsAddToColumnAndHeightAdjustsTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-tabs"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetLargeMinimumHeightAndHeightDoesNotAdjustTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetLargeMinimumHeightAndHeightDoesNotAdjustTest.xml
index cf058da10fd..bcab23fac48 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetLargeMinimumHeightAndHeightDoesNotAdjustTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetLargeMinimumHeightAndHeightDoesNotAdjustTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsAddToColumnWithSetLargeMinimumHeightAndHeightDoesNotAdjustTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-tabs"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetSmallMinimumHeightAndHeightAdjustsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetSmallMinimumHeightAndHeightAdjustsTest.xml
index 836cb664aae..f25bf915813 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetSmallMinimumHeightAndHeightAdjustsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnContentTest/TabsAddToColumnWithSetSmallMinimumHeightAndHeightAdjustsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsAddToColumnWithSetSmallMinimumHeightAndHeightAdjustsTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-tabs"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CanAddColumnToSmallGridSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CanAddColumnToSmallGridSizeTest.xml
index 970dd53577b..4f29a8f8c18 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CanAddColumnToSmallGridSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CanAddColumnToSmallGridSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CanAddColumnToSmallGridSizeTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CannotAddColumnToFullSmallGridSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CannotAddColumnToFullSmallGridSizeTest.xml
index 376ecff831f..b0fe190c35d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CannotAddColumnToFullSmallGridSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/CannotAddColumnToFullSmallGridSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CannotAddColumnToFullSmallGridSizeTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateColumnGridTooltipMessageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateColumnGridTooltipMessageTest.xml
index 71984b99c55..c5046dd3fc0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateColumnGridTooltipMessageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateColumnGridTooltipMessageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnValidateColumnGridTooltipMessageTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/pagebuilder/column_grid_default 3" stepKey="setDefaultGridSize"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateOddDefaultGridSizeIsSplitCorrectlyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateOddDefaultGridSizeIsSplitCorrectlyTest.xml
index 8d0077c247f..bbb29fb650c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateOddDefaultGridSizeIsSplitCorrectlyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ColumnValidateOddDefaultGridSizeIsSplitCorrectlyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnValidateOddDefaultGridSizeIsSplitCorrectlyTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml
old mode 100644
new mode 100755
index 7f66404bf94..c184d0f20b6
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="MoveColumnBetweenGroupsOfDifferentGridSizeTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -56,6 +57,6 @@
             <argument name="containerTargetIndex" value="3"/>
         </actionGroup>
         <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1', '8/8')}}" stepKey="verifyOriginalColumnGroup"/>
-        <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2', '1/12')}}" stepKey="verifyMovedColumn"/>
+        <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2', '6/12')}}" stepKey="verifyMovedColumn"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize14Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize14Test.xml
index 82306fd3f12..6d31e2f7478 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize14Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize14Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SetDefaultGridSize14Test">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize7Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize7Test.xml
index 29a01f50105..e218c9404d5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize7Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/SetDefaultGridSize7Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SetDefaultGridSize7Test">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateColumnsMaintainRatioWithoutHistoryTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateColumnsMaintainRatioWithoutHistoryTest.xml
index b82dd97ac65..1bf8d912cdd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateColumnsMaintainRatioWithoutHistoryTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateColumnsMaintainRatioWithoutHistoryTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateColumnsMaintainRatioWithoutHistoryTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-columnGridSize"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateDifferentGridSizePerGroupTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateDifferentGridSizePerGroupTest.xml
index e2bbcec6322..12dca958341 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateDifferentGridSizePerGroupTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateDifferentGridSizePerGroupTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateDifferentGridSizePerGroupTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateEmptyColumnsDeletedOnSmallerGridSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateEmptyColumnsDeletedOnSmallerGridSizeTest.xml
index f09fb1da2f5..7986f79bba5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateEmptyColumnsDeletedOnSmallerGridSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateEmptyColumnsDeletedOnSmallerGridSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateEmptyColumnsDeletedOnSmallerGridSizeTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-columnGridSize"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridDefaultSizeOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridDefaultSizeOnStageTest.xml
index 90d6e3cc174..d7613b69eee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridDefaultSizeOnStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridDefaultSizeOnStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateGridDefaultSizeOnStageTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridInputFocusedOnOpenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridInputFocusedOnOpenTest.xml
index ea08784b69d..831c955df8b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridInputFocusedOnOpenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridInputFocusedOnOpenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseOnArrowClickTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseOnArrowClickTest.xml
index 09dfd361c02..a6baa91c525 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseOnArrowClickTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseOnArrowClickTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseWithErrorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseWithErrorTest.xml
index 80e1d628a8d..c260b332104 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseWithErrorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridPanelWontCloseWithErrorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageAfterTabItemOptionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageAfterTabItemOptionsTest.xml
index 384ff489edb..7804809dd9f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageAfterTabItemOptionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageAfterTabItemOptionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageTest.xml
index 2be0edb3411..9ab13d0541b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeFormDisablesStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeSmallerThanColumnsErrorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeSmallerThanColumnsErrorTest.xml
index 6c2f765da5e..8c7281eb589 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeSmallerThanColumnsErrorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateGridSizeSmallerThanColumnsErrorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateGridSizeSmallerThanColumnsErrorTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateInvalidGridSizeErrorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateInvalidGridSizeErrorTest.xml
index e0a7fde2f18..ee2d757c340 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateInvalidGridSizeErrorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateInvalidGridSizeErrorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateInvalidGridSizeErrorTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateMaxColumnErrorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateMaxColumnErrorTest.xml
index d44d6d4662f..d57c0e0cd89 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateMaxColumnErrorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateMaxColumnErrorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateMaxColumnErrorTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeHistoryTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeHistoryTest.xml
index e5f52a9f1f1..0b6a51667aa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeHistoryTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeHistoryTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateResizeHistoryTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeOnUnevenGridTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeOnUnevenGridTest.xml
index 707eba77ac2..c29fec5cbb8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeOnUnevenGridTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateResizeOnUnevenGridTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateResizeOnUnevenGridTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateUnfocusUpdatesGridTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateUnfocusUpdatesGridTest.xml
index c370138b406..bf381952cae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateUnfocusUpdatesGridTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/ValidateUnfocusUpdatesGridTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ValidateUnfocusUpdatesGridTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupDuplicateAndHideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupDuplicateAndHideTest.xml
index c5bfbc0bd74..584a72f2cba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupDuplicateAndHideTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupDuplicateAndHideTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteColumnOneDesktopImageFromStorage">
                 <argument name="Image" value="PageBuilderColumnOneDesktopImage_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnsToRootContainer">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupEditSettingsAndVerifyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupEditSettingsAndVerifyTest.xml
index f16229b45bc..e57a675a750 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupEditSettingsAndVerifyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupEditSettingsAndVerifyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -49,7 +49,7 @@
             <argument name="property" value="PageBuilderColumnAppearanceProperty_Bottom"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="editMinHeightPropertyColumn1">
-            <argument name="property" value="PageBuilderMinHeightProperty_100"/>
+            <argument name="property" value="PageBuilderMinHeightProperty_150"/>
         </actionGroup>
         <actionGroup ref="chooseVisualSelectOption" stepKey="editVerticalAlignmentPropertyColumn1">
             <argument name="property" value="PageBuilderVerticalAlignmentPropertyBottom"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsFrontendTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsFrontendTest.xml
index 93c6b1faf11..9ebd413108a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsFrontendTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsFrontendTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -61,7 +61,7 @@
         <!-- Verify Column One -->
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeColumnOneMinHeightApplied">
             <argument name="selector" value="{{ColumnOnFrontend.advancedConfigurationPath('1')}}"/>
-            <argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_100.value}}"/>
+            <argument name="expectedProperty" value="{{PageBuilderMinHeightProperty_150.value}}"/>
             <argument name="cssProperty" value="minHeight"/>
         </actionGroup>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeColumnOneColumnAppearanceApplied">
@@ -142,6 +142,6 @@
             <argument name="backgroundAttachment" value="PageBuilderBackgroundAttachment_Scroll"/>
             <argument name="index" value="2"/>
         </actionGroup>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsTest.xml
index 6d5d2dc5011..f5ebc7473c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -45,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteColumnTwoMobileImageFromStorage">
                 <argument name="Image" value="PageBuilderColumnTwoMobileImage_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnsToRootContainer">
@@ -117,7 +123,7 @@
             <argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightPropertyColumn1">
-            <argument name="property" value="PageBuilderMinHeightProperty_100"/>
+            <argument name="property" value="PageBuilderMinHeightProperty_150"/>
         </actionGroup>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterVerticalAlignmentTopPropertyColumn1">
             <argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
@@ -287,7 +293,7 @@
             <argument name="property" value="PageBuilderColumnAppearanceProperty_Center"/>
         </actionGroup>
         <actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeColumnOneMinHeightProperty_100">
-            <argument name="property" value="PageBuilderMinHeightProperty_100"/>
+            <argument name="property" value="PageBuilderMinHeightProperty_150"/>
         </actionGroup>
         <actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="seeColumnOneVerticalAlignmentProperty">
             <argument name="property" value="PageBuilderVerticalAlignmentPropertyTop"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnLineTest/ColumnLineMoveColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnLineTest/ColumnLineMoveColumnTest.xml
new file mode 100644
index 00000000000..8e2382e15e1
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnLineTest/ColumnLineMoveColumnTest.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ColumnLineMoveColumnTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Column Lines"/>
+            <title value="[Columns] A user should be able to move a column into another line of the column group"/>
+            <description value="A user should be able to move a column another line of the column group"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="PB-1211"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-column"/>
+            <group value="pagebuilder-column-group"/>
+            <group value="pagebuilder-column-line"/>
+        </annotations>
+        <before>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
+                <argument name="CMSPage" value="$$createCMSPage$$"/>
+            </actionGroup>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnsToRootContainer">
+            <argument name="contentType" value="PageBuilderColumnGroupContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1','6/12')}}" stepKey="findBeforeLabelColumn1"/>
+        <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','6/12')}}" stepKey="findBeforeLabelColumn2"/>
+        <!-- Duplicate Column 1-->
+        <comment userInput="Duplicate Column 1" stepKey="duplicateColumn1Comment"/>
+        <actionGroup ref="duplicateContentType" stepKey="duplicateColumn1">
+            <argument name="contentType" value="PageBuilderColumnContentType"/>
+        </actionGroup>
+        <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1','3/12')}}" stepKey="findAfterDuplicateLabelColumn1"/>
+        <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2','3/12')}}" stepKey="findAfterDuplicateLabelColumn2"/>
+        <!-- Drop new Column Group -->
+        <actionGroup ref="dragContentTypeNextToExistingContentType" stepKey="dragColumnGroup2ToRootContainer">
+            <argument name="contentType" value="PageBuilderColumnGroupContentType"/>
+            <argument name="existingContentType" value="PageBuilderColumnGroupContentType"/>
+            <argument name="contentTypeIndex" value="2"/>
+        </actionGroup>
+       <!-- <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2' ,'1','6/12')}}" stepKey="findSecondColumnLineColumn1"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2','2','6/12')}}" stepKey="findSecondColumnLineColumn2"/> -->
+        <!-- Drag column from CG2 to CG1 -->
+        <actionGroup ref="dragExistingColumnToExistingColumnLine" stepKey="moveColumnToCG1ColumnLine1">
+            <argument name="containerColumnGroupIndex" value="1"/>
+            <argument name="containerColumnLineIndex" value="1"/>
+            <argument name="columnIndexInNewLine" value="1" />
+            <argument name="columnIndex" value="3" />
+        </actionGroup>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('1' ,'1','3/12')}}" stepKey="findFirstColumnLineColumn1AftermoveColumn"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('1','2','3/12')}}" stepKey="findFirstColumnLineColumn2AftermoveColumn"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('1','3','6/12')}}" stepKey="findFirstColumnLineColumn3AftermoveColumn"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2','1','6/12')}}" stepKey="findSecondColumnLineColumn1AftermoveColumn"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2','2','6/12')}}" stepKey="findSecondColumnLineColumn2AftermoveColumn"/>
+        <!-- Drag column from CG1 to CG2 -->
+        <actionGroup ref="dragExistingColumnToExistingColumnLine" stepKey="moveColumnToCG2ColumnLine1">
+            <argument name="containerColumnGroupIndex" value="2"/>
+            <argument name="containerColumnLineIndex" value="1"/>
+            <argument name="columnIndexInNewLine" value="1" />
+            <argument name="columnIndex" value="1" />
+        </actionGroup>
+
+
+        <executeJS function="return document.querySelector('{{ColumnOnBackend.columnResizeGridLine('4')}}').clientWidth" stepKey="guideWidth"/>
+        <dragAndDrop selector1="{{ColumnOnBackend.columnX('1')}} {{ColumnOnBackend.columnResizeHandle}}" selector2="{{ColumnOnBackend.columnResizeGridLine('4')}}" x="$guideWidth" stepKey="resizeColumnTwo"/>
+        <waitForPageLoad stepKey="waitForDragAndDrop"/>
+
+        <!-- save page -->
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitSecondTimePageBuilderFullScreen"/>
+        <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveSecondTimeAndContinueEditCmsPage"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchSecondTimeToPageBuilderStage"/>
+        <!-- Verify Column Widths in stage after save-->
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('1','1','4/12')}}" stepKey="verifyFirstColumnLineColumn1AftermoveColumnToCG2ColumnLine1"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('1','2','8/12')}}" stepKey="verifyFirstColumnLineColumn2AftermoveColumnToCG2ColumnLine1"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2','1','3/12')}}" stepKey="verifySecondColumnLineColumn1AftermoveColumnToCG2ColumnLine1"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2' ,'2','3/12')}}" stepKey="verifySecondColumnLineColumn2AftermoveColumnToCG2ColumnLine1"/>
+        <waitForElementVisible selector="{{ColumnLineOnBackend.childColumnDisplayLabel('2','3','6/12')}}" stepKey="verifySecondColumnLineColumn3AftermoveColumnToCG2ColumnLine1"/>
+    </test>
+</tests>
+
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to0Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to0Test.xml
index 776e69a786e..34a5b1692e3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to0Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to0Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize1to0Test">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1Test.xml
index ef24d29177d..b4d136f3a6b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize1to1Test">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1to1Test.xml
index 3317be31aea..1ee908ef671 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize1to1to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize1to1to1Test">
@@ -17,6 +17,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize2to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize2to1Test.xml
index ded2f8a4ce4..e0bac937423 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize2to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize2to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize2to1Test">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to1to1to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to1to1to1Test.xml
index 84838742ee9..e8a55a880dd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to1to1to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to1to1to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize3to1to1to1Test">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to2to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to2to1Test.xml
index 9393d779158..3183cf9baa1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to2to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize3to2to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize3to2to1Test">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize4to1to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize4to1to1Test.xml
index 38f0c6bfa44..834660efdd0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize4to1to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize4to1to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize4to1to1Test">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize5to1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize5to1Test.xml
index 12b1c49ecfc..8d118fd1216 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize5to1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResize5to1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResize5to1Test">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResizeLeftColumnFromSecondColumnHandleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResizeLeftColumnFromSecondColumnHandleTest.xml
index 2e66c0d977b..5fc5acc779b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResizeLeftColumnFromSecondColumnHandleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnResizingTest/ColumnResizeLeftColumnFromSecondColumnHandleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnResizeLeftColumnFromSecondColumnHandleTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-columnResize"/>
             <group value="pagebuilder-columnGridSize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAddToRowAndHeightAdjustsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAddToRowAndHeightAdjustsTest.xml
index bd91649687a..2d9886b7894 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAddToRowAndHeightAdjustsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAddToRowAndHeightAdjustsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAppearanceSettingsShowOnFrontendTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAppearanceSettingsShowOnFrontendTest.xml
index af4779cee12..0eb7f4e61a7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAppearanceSettingsShowOnFrontendTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnAppearanceSettingsShowOnFrontendTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnAppearanceSettingsShowOnFrontendTest">
@@ -17,6 +17,7 @@
             <testCaseId value="MC-2383"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnBackgroundColorPreservedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnBackgroundColorPreservedTest.xml
index 0bfeb9c19a4..f4b9a0c0a7c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnBackgroundColorPreservedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnBackgroundColorPreservedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCanInteractEditPanelTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCanInteractEditPanelTest.xml
index 1bc7cabed81..1fabe9ac2e8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCanInteractEditPanelTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCanInteractEditPanelTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddInsideColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddInsideColumnTest.xml
index b1571c512be..ed9dd685d56 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddInsideColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddInsideColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnCannotAddInsideColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-columnGeneral"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddToStageTest.xml
index 0c55dd0a09b..989c0340ec8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnChangesPreservedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnChangesPreservedTest.xml
index 3196d1acec2..fb8a0af0c3a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnChangesPreservedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnChangesPreservedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -40,6 +43,9 @@
             <waitForPageLoad stepKey="waitForPageLoad"/>
             <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" stepKey="clickToResetFilter" visible="true"/>
             <waitForPageLoad stepKey="waitForGridReload"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle1">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnConfigurationHasVerticalAlignmentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnConfigurationHasVerticalAlignmentTest.xml
index 261834c02ce..b03faf97232 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnConfigurationHasVerticalAlignmentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnConfigurationHasVerticalAlignmentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedTest.xml
index 90b54978563..b76c754cf06 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedWithAppearanceAndDifferentMinimumHeightsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedWithAppearanceAndDifferentMinimumHeightsTest.xml
index f5ed112f0f8..e335abd6b86 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedWithAppearanceAndDifferentMinimumHeightsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnContentIsVerticallyAlignedWithAppearanceAndDifferentMinimumHeightsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2504"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnDuplicateTest.xml
index b9488b5a543..f881c3fa01e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnFullHeightShowsOnFrontendTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnFullHeightShowsOnFrontendTest.xml
index dbbc0d02092..b6b8e55a4cf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnFullHeightShowsOnFrontendTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnFullHeightShowsOnFrontendTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-heading"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnLabelsUpdateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnLabelsUpdateTest.xml
index a26537e8d4c..3e757c7ee2a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnLabelsUpdateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnLabelsUpdateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ColumnLabelsUpdateTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml
index b43be919352..ba168407301 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnNoRequiredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -44,7 +45,7 @@
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundColorProperty">
             <argument name="property" value="PageBuilderBackgroundColorProperty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundImageProperty">
+        <actionGroup ref="validateSlideOutPanelFieldWithUploaderId" stepKey="seeBackgroundImageProperty">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelField" stepKey="seeBackgroundPositionProperty">
@@ -65,7 +66,7 @@
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundColorNotRequired">
             <argument name="property" value="PageBuilderBackgroundColorProperty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundImageIsRequired">
+        <actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="seeBackgroundImageIsRequired">
             <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="seeBackgroundPositionNotRequired">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnPlaceholderInAdminPreviewTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnPlaceholderInAdminPreviewTest.xml
index 85ab3b44c24..a7193e69682 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnPlaceholderInAdminPreviewTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnPlaceholderInAdminPreviewTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnSettingsAppearInAdminTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnSettingsAppearInAdminTest.xml
index e4bc032459b..1b70203e91d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnSettingsAppearInAdminTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnSettingsAppearInAdminTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-2655"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -36,6 +40,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml
index b15d92288f9..2ecd09c3f3a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnValidateDefaultAndUpdateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersAndPaddingEqualToMinHeightTest.xml
index 310c60938aa..54ed54ffd74 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
             <argument name="property" value="PageBuilderMinHeightProperty_300"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
index 9ed528da6ae..91ae1a467d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterMinHeightProperty">
             <argument name="property" value="PageBuilderMinHeightProperty_200"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DragMultipleColumnsIntoRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DragMultipleColumnsIntoRowTest.xml
index 2d9fe80bf42..76e679b4a74 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DragMultipleColumnsIntoRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DragMultipleColumnsIntoRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DuplicatingColumnWillDivideSourceColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DuplicatingColumnWillDivideSourceColumnTest.xml
index bfe080b8f32..ea71fcf1da4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DuplicatingColumnWillDivideSourceColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/DuplicatingColumnWillDivideSourceColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnResize"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/PreviewBackgroundImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/PreviewBackgroundImageTest.xml
index 2de1dfda6e5..949d4973819 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/PreviewBackgroundImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/PreviewBackgroundImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-2395"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -36,6 +40,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="dragContentTypeToStage" stepKey="dragColumnIntoStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemoveColumnFromStageAndRowShrinksTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemoveColumnFromStageAndRowShrinksTest.xml
index f15d0f223fd..8fc6aca5520 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemoveColumnFromStageAndRowShrinksTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemoveColumnFromStageAndRowShrinksTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemovingColumnDistributesWidthTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemovingColumnDistributesWidthTest.xml
index ce2c01c8b5b..6204d1d44e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemovingColumnDistributesWidthTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/RemovingColumnDistributesWidthTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="RemovingColumnDistributesWidthTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnChildHideShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnChildHideShowTest.xml
index 38ca11b3359..c9aef851918 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnChildHideShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnChildHideShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnNotHideableTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnNotHideableTest.xml
index ce4b9d247ab..f9c56aed578 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnNotHideableTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateColumnNotHideableTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateShowHideOnColumnChildDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateShowHideOnColumnChildDefaultStateTest.xml
index 829b46ecd02..f73fb2af058 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateShowHideOnColumnChildDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ValidateShowHideOnColumnChildDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderCategoryButtonLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderCategoryButtonLinkTest.xml
index 7db4693cc8e..0f9736068fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderCategoryButtonLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderCategoryButtonLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,25 +19,27 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-link"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+            <createData entity="SimpleSubCategory" stepKey="createCategoryB"/>
+            <createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryY">
+                <requiredEntity createDataKey="createCategoryB"/>
+            </createData>
+            <createData entity="_defaultCategory" stepKey="createCategoryA"/>
+            <createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryX">
+                <requiredEntity createDataKey="createCategoryA"/>
+            </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
+            <deleteData createDataKey="createCategoryA" stepKey="deletePreReqCatalogA"/>
+            <deleteData createDataKey="createCategoryB" stepKey="deletePreReqCatalogB"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
         </after>
-        <createData entity="SimpleSubCategory" stepKey="createCategoryB"/>
-        <createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryY">
-            <requiredEntity createDataKey="createCategoryB"/>
-        </createData>
-        <createData entity="_defaultCategory" stepKey="createCategoryA"/>
-        <createData entity="NewSubCategoryWithParent" stepKey="createSubCategoryX">
-            <requiredEntity createDataKey="createCategoryA"/>
-        </createData>
-
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
@@ -122,6 +124,5 @@
             <expectedResult type="string">/Category with ID: [0-9]+ doesn't exist$/</expectedResult>
             <actualResult type="variable">textFromDropDown3</actualResult>
         </assertRegExp>
-        <deleteData createDataKey="createCategoryA" stepKey="deletePreReqCatalogA"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderPageButtonLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderPageButtonLinkTest.xml
index ea3003a700c..cfb408fef20 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderPageButtonLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderPageButtonLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-link"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
@@ -76,16 +77,21 @@
         <!--Expand dropdown again to verify highlighted not cleared yet-->
         <click selector="{{PageBuilderLinkAttributeAdmin.LinkDropdown}}" stepKey="expandButtonLinkDropdownInput2"/>
         <seeInField selector="{{PageBuilderLinkAttributeAdmin.LinkSearch}}" userInput="cm" stepKey="seeSearchNotCleared"/>
-        <seeElement selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="seeSearchResultHighlighted"/>
+        <waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.LinkItemSelected($createCMSPageA.title$)}}" stepKey="seeSearchResultHighlighted"/>
 
         <!--Select another page from dropdown-->
+	    <clearField selector="{{PageBuilderLinkAttributeAdmin.LinkSearch}}" stepKey="clearLinkSearchField"/>
+        <fillField selector="{{PageBuilderLinkAttributeAdmin.LinkSearch}}" userInput="{{$createCMSPageB.title$}}" stepKey="fillCreateCMSPageBInSearchField"/>
+	    <waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.SearchResult($createCMSPageB.title$)}}" stepKey="waitForCMSPageBVisible"/>
+	    <scrollTo selector="{{PageBuilderLinkAttributeAdmin.SearchResult($createCMSPageB.title$)}}" stepKey="scrollToLinks"/>
+        <waitForElementClickable selector="{{PageBuilderLinkAttributeAdmin.SearchResult($createCMSPageB.title$)}}" stepKey="waitForCMSPageBClickable"/>
         <click selector="{{PageBuilderLinkAttributeAdmin.SearchResult($createCMSPageB.title$)}}" stepKey="clickCMSPageBOnSearchResult"/>
         <grabTextFrom selector="{{PageBuilderLinkAttributeAdmin.DropdownInput}}" stepKey="textFromDropDown2"/>
         <assertEquals stepKey="assertEquals2" message="pass">
             <expectedResult type="string">$createCMSPageB.title$</expectedResult>
             <actualResult type="variable">textFromDropDown2</actualResult>
         </assertEquals>
-        <seeElement selector="{{PageBuilderLinkAttributeAdmin.RemoveBtn}}" stepKey="seeXButtonInField2"/>
+        <waitForElementVisible selector="{{PageBuilderLinkAttributeAdmin.RemoveBtn}}" stepKey="seeXButtonInField2"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings1"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage1"/>
@@ -93,8 +99,8 @@
         <!--Go to storefront to verify CMS Page Link-->
         <amOnPage url="$$createCMSPage.identifier$$" stepKey="amOnPageTestPage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <seeElement selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="seeButtonItemOnStoreFront"/>
-        <seeElement selector="{{ButtonItemOnStorefront.buttonItemContainsUrl('1', $createCMSPageB.identifier$)}}" stepKey="seePageLinkOnStoreFront"/>
+        <waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemType('1', PageBuilderButtonItemType_Primary.value)}}" stepKey="seeButtonItemOnStoreFront"/>
+        <waitForElementVisible selector="{{ButtonItemOnStorefront.buttonItemContainsUrl('1', $createCMSPageB.identifier$)}}" stepKey="seePageLinkOnStoreFront"/>
         <click selector=".pagebuilder-button-primary" stepKey="clickButton"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <see userInput="$createCMSPageB.title$" stepKey="seePageName"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderProductButtonLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderProductButtonLinkTest.xml
index 57aa02e359a..30b2e5813ef 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderProductButtonLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderProductButtonLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-link"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderURLInputLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderURLInputLinkTest.xml
index f4da1e00b98..3a871a1d0c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderURLInputLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/AdminPageBuilderURLInputLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-link"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/CancelOnRemovalConfirmationModalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/CancelOnRemovalConfirmationModalTest.xml
index 43929734c5d..59bb17c8b04 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/CancelOnRemovalConfirmationModalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/CancelOnRemovalConfirmationModalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnConfiguredContentTypeRemovalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnConfiguredContentTypeRemovalTest.xml
index 92e72c1ea25..789e2380218 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnConfiguredContentTypeRemovalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnConfiguredContentTypeRemovalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnContainerWithChildrenRemovalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnContainerWithChildrenRemovalTest.xml
index 09ca5289b8f..d0ae5410529 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnContainerWithChildrenRemovalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/ConfirmationOnContainerWithChildrenRemovalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DefaultSystemBordersAppearInAdminTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DefaultSystemBordersAppearInAdminTest.xml
index e16f082be12..5f9809b11b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DefaultSystemBordersAppearInAdminTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DefaultSystemBordersAppearInAdminTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DefaultSystemBordersAppearInAdminTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissRemovalConfirmationModalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissRemovalConfirmationModalTest.xml
index f9e04aa5cb9..d2a9791ddf8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissRemovalConfirmationModalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissRemovalConfirmationModalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissedConfirmationPersistsSessionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissedConfirmationPersistsSessionTest.xml
index 784411f4bf6..e93aa15889a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissedConfirmationPersistsSessionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/DismissedConfirmationPersistsSessionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditFormModalNoResetButtonTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditFormModalNoResetButtonTest.xml
index 1aebd03065f..82865453ef2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditFormModalNoResetButtonTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditFormModalNoResetButtonTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-common"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerUpdatesFromFieldInputTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerUpdatesFromFieldInputTest.xml
index 8dd4c4fd2ce..7b8da55c822 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerUpdatesFromFieldInputTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerUpdatesFromFieldInputTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml
index 765ad94946e..f5b55f82f37 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/LoginCycleResetsRemoveConfirmationDismissalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/LoginCycleResetsRemoveConfirmationDismissalTest.xml
index 5d9ba95074c..0c715d1f2e1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/LoginCycleResetsRemoveConfirmationDismissalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/LoginCycleResetsRemoveConfirmationDismissalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoConfirmationOnDefaultStateContentTypeRemovalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoConfirmationOnDefaultStateContentTypeRemovalTest.xml
index 4dabd0d454f..6c37885f023 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoConfirmationOnDefaultStateContentTypeRemovalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoConfirmationOnDefaultStateContentTypeRemovalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoRemovalConfirmationModalAfterConfiguringContentToDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoRemovalConfirmationModalAfterConfiguringContentToDefaultStateTest.xml
index feb17dc844e..be045edde4f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoRemovalConfirmationModalAfterConfiguringContentToDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/NoRemovalConfirmationModalAfterConfiguringContentToDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/XOnRemovalConfirmationModalTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/XOnRemovalConfirmationModalTest.xml
index 846bea68bfd..67400cfaa38 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/XOnRemovalConfirmationModalTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/XOnRemovalConfirmationModalTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-heading"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml
index 78297781e92..4b20880cf8e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderContainerTest/PageBuilderVerifyContainerAffordanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="PageBuilderVerifyContainerAffordanceTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineColorTest.xml
index 7b583f76ec6..65fa788f6b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineThicknessTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineThicknessTest.xml
index 5b6c0520386..82e76d916b3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineThicknessTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerEmptyLineThicknessTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLALineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLALineColorTest.xml
index 45e31cd24bc..e950e9ae4c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLALineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLALineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLLineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLLineColorTest.xml
index bbd27b9ab29..45abca65329 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLLineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHSLLineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHexLineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHexLineColorTest.xml
index 182c7f04050..82dcd43b341 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHexLineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerHexLineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerInvalidLineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerInvalidLineColorTest.xml
index c674cb59c26..6c2970d7626 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerInvalidLineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerInvalidLineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNegativeLineThicknessTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNegativeLineThicknessTest.xml
index 158ea40d27a..27be00da189 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNegativeLineThicknessTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNegativeLineThicknessTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNormalLineThicknessTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNormalLineThicknessTest.xml
index 7c0dcb227f6..df9872c734b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNormalLineThicknessTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerNormalLineThicknessTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBALineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBALineColorTest.xml
index a5288fedf91..947c8b74d9a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBALineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBALineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBLineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBLineColorTest.xml
index 7b0cb2cd78f..042d09e29c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBLineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerRGBLineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerYellowLineColorTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerYellowLineColorTest.xml
index bb49a8ae1a9..afd37781364 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerYellowLineColorTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerYellowLineColorTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerZeroLineThicknessTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerZeroLineThicknessTest.xml
index 536df256c5a..1845cedc09f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerZeroLineThicknessTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerGeneralAttributesTest/DividerZeroLineThicknessTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-divider-general"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerAddToCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerAddToCMSPageTest.xml
index 0a9922a829a..3602a1db88d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerAddToCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerAddToCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCanAddToColumnTest.xml
index 93a80670577..179d0a080ce 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DividerCanAddToColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCannotAddToStageTest.xml
index 0b0cf794a9c..e505a30f6e6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDeleteTest.xml
index c49b0f6b9d5..9c0c850cd6f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-dividerCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDuplicateTest.xml
index 862319e3928..b33bcf564e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerMoveDividerTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerMoveDividerTest.xml
index 765f4e7f1ba..85d29b8abf7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerMoveDividerTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerMoveDividerTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DividerMoveDividerTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-dividerCommon"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerNoRequiredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerNoRequiredTest.xml
index f974e892b8f..a09d08f5bb0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerNoRequiredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerNoRequiredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerUpdateAdvancedConfigurationValuesTest.xml
index cf2d78e2769..a58009fbf66 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2533"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateAdvancedConfigurationDefaultValuesTest.xml
index d29f0951949..1291bcd3839 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DividerValidateAdvancedConfigurationDefaultValuesTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateGeneralDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateGeneralDefaultValuesTest.xml
index 0501f39aa1c..b632c48cd7f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateGeneralDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/DividerValidateGeneralDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerDefaultStateTest.xml
index bfb4336ae05..16d211aeb4f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerTest.xml
index 7befd4ee8ab..178e453aa57 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderDividerTest/ValidateShowHideOnDividerTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-divider"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCanAddAndEditContentTypesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCanAddAndEditContentTypesTest.xml
index 1e4c2397480..4c74da7c4c4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCanAddAndEditContentTypesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCanAddAndEditContentTypesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-buttons"/>
             <group value="pagebuilder-fullScreen"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCoversEntireScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCoversEntireScreenTest.xml
index e8d16f35882..34d24aa66b1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCoversEntireScreenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenCoversEntireScreenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-fullScreen"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenLeftPanelHeightAndFunctionalityTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenLeftPanelHeightAndFunctionalityTest.xml
index b9a87204d00..87705e3571a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenLeftPanelHeightAndFunctionalityTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderFullScreenModeTest/PageBuilderFullScreenLeftPanelHeightAndFunctionalityTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-fullScreen"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditNonBreakingSpaceStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditNonBreakingSpaceStageTest.xml
index aff3ef3690c..81651fe759d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditNonBreakingSpaceStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditNonBreakingSpaceStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH1StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH1StageTest.xml
index 54817d9efc0..27830b45361 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH1StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH1StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH2StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH2StageTest.xml
index 2f02e770a31..7db46cb8682 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH2StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH2StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH3StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH3StageTest.xml
index d9e46556e91..96256bf2162 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH3StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH3StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH4StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH4StageTest.xml
index 0379afe0906..b0e1c4e1c79 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH4StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH4StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH5StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH5StageTest.xml
index d1fbd446f1e..891e024c2fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH5StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH5StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH6StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH6StageTest.xml
index 3b0c4900929..9d07bb0ba8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH6StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingEditTypeH6StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingInlineEditToolbarTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingInlineEditToolbarTest.xml
index 03402adbb6a..87f6c8e4b45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingInlineEditToolbarTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingInlineEditToolbarTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingToolbarButtonsCanWrapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingToolbarButtonsCanWrapTest.xml
index 9989d688d6e..d55a50d8ffc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingToolbarButtonsCanWrapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingEditOnStageTest/HeadingToolbarButtonsCanWrapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HeadingToolbarButtonsCanWrapTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingCannotAddToStageTest.xml
index 5e43181af48..1edbaba49a8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDefaultStateTest.xml
index 4a293cc55ae..ab9b1eb376d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDeleteTest.xml
index b381d922b8e..2bd9a0f33b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDuplicateTest.xml
index e254678fea4..54534deb9a8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2919"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditPanelGeneralSectionVisualTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditPanelGeneralSectionVisualTest.xml
index 9193c13f096..f897d32fff1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditPanelGeneralSectionVisualTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditPanelGeneralSectionVisualTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTextTest.xml
index a9d7b864f01..4636218fea8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH1Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH1Test.xml
index bd6b62947f0..8dde4edcc89 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH1Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH1Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH2Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH2Test.xml
index befc9b1a080..879b01086bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH2Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH2Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH3Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH3Test.xml
index 6c351768156..1b54b511ad2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH3Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH3Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH4Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH4Test.xml
index 803876ebd26..548249ce240 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH4Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH4Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH5Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH5Test.xml
index 4092a5f75df..3e0ef6088d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH5Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH5Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH6Test.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH6Test.xml
index ee4d19a1a61..f3355f1afee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH6Test.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingEditTypeH6Test.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingLiveEditToolbarNotCutOffInFullScreenModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingLiveEditToolbarNotCutOffInFullScreenModeTest.xml
old mode 100644
new mode 100755
index a837c41d41a..851b5a79d8f
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingLiveEditToolbarNotCutOffInFullScreenModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingLiveEditToolbarNotCutOffInFullScreenModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HeadingLiveEditToolbarNotCutOffInFullScreenModeTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -53,7 +54,7 @@
             <argument name="contentType" value="PageBuilderColumnContentType"/>
             <argument name="targetIndex" value="1"/>
         </actionGroup>
-        <seeElement selector="{{ColumnOnBackend.displayLabel('1','1/12')}}" stepKey="validateFirstColumnWidth"/>
+        <seeElement selector="{{ColumnOnBackend.displayLabel('1','2/12')}}" stepKey="validateFirstColumnWidth"/>
         <!-- Add Heading Content Type -->
         <comment userInput="Add Heading Content Type" stepKey="commentAddInnerContentType"/>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderInnerContentTypePanelMenuSection">
@@ -132,7 +133,7 @@
             <argument name="contentType" value="PageBuilderColumnContentType"/>
             <argument name="contentTypeNumber" value="1"/>
         </actionGroup>
-        <seeElement selector="{{ColumnOnBackend.displayLabel('1','3/12')}}" stepKey="validateColumnWidth"/>
+        <seeElement selector="{{ColumnOnBackend.displayLabel('1','6/12')}}" stepKey="validateColumnWidth"/>
         <!-- Add Another Heading Content Type -->
         <actionGroup ref="dragContentTypeToContainer" stepKey="dragHeadingContentTypeIntoColumn2">
             <argument name="contentType" value="PageBuilderHeadingContentType"/>
@@ -141,6 +142,7 @@
             <argument name="contentTypeIndex" value="1"/>
         </actionGroup>
         <executeJS function="{{HeadingOnStage.headingToolbarViewportPositionTop('0')}}" stepKey="toolbarTopPositionInMediumColumn"/>
+        <executeJS function="return {$toolbarTopPositionInMediumColumn} * 2.24" stepKey="toolbarTopPositionInMediumColumnCalc"/>
         <executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionBottom('0')}}" stepKey="inputBoxBottomPositionInMediumColumn"/>
         <executeJS function="{{HeadingOnStage.headingContentTypeViewportPositionTop('0')}}" stepKey="inputBoxTopPositionInMediumColumn"/>
         <!-- Assert toolbar did not overflow in 3/12 column -->
@@ -151,7 +153,7 @@
         <!-- Check top of toolbar is below bottom of input box in 3/12 column -->
         <assertGreaterThanOrEqual stepKey="assertToolbarAboveInputBoxInMediumColumn">
             <expectedResult type="variable">$inputBoxBottomPositionInMediumColumn</expectedResult>
-            <actualResult type="variable">$toolbarTopPositionInMediumColumn</actualResult>
+            <actualResult type="variable">$toolbarTopPositionInMediumColumnCalc</actualResult>
         </assertGreaterThanOrEqual>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingOptionsMenuNotOverflowRightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingOptionsMenuNotOverflowRightTest.xml
index f328d2a83ea..b07ff7847b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingOptionsMenuNotOverflowRightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingOptionsMenuNotOverflowRightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HeadingOptionsMenuNotOverflowRightTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -49,7 +50,7 @@
             <argument name="contentType" value="PageBuilderColumnContentType"/>
             <argument name="targetIndex" value="3"/>
         </actionGroup>
-        <seeElement selector="{{ColumnOnBackend.displayLabel('4','1/12')}}" stepKey="validateLastColumnWidth"/>
+        <seeElement selector="{{ColumnOnBackend.displayLabel('4','3/12')}}" stepKey="validateLastColumnWidth"/>
         <!-- Add Heading Content Type -->
         <comment userInput="Add Heading Content Type" stepKey="commentAddHeadingContentType"/>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandHeadingPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingUpdateAdvancedConfigurationValuesTest.xml
index 38af29daf5b..dd801b24bed 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingValidateAdvancedConfigurationDefaultValuesTest.xml
index cf3a3e2ad1e..4106b5c2039 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyNoRequiredAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyNoRequiredAttributesTest.xml
index 23a350083d5..c52e60e77a8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyNoRequiredAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyNoRequiredAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyOnHoverOptionMenuTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyOnHoverOptionMenuTest.xml
index 772f6c3e57d..cc078d73602 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyOnHoverOptionMenuTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/HeadingVerifyOnHoverOptionMenuTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingDefaultStateTest.xml
index 461769e9563..a80439431c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingTest.xml
index a94c0dc5dd3..d103097d371 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHeadingTest/ValidateShowHideOnHeadingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCanAddToColumnTest.xml
index cb2ab5ddaad..e42a3a18dd8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HTMLCanAddToColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-html"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCannotAddToStageTest.xml
index 5975951de1b..2cc6ff23f78 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLEmptyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLEmptyTest.xml
index b75ddd24ca2..da454328605 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLEmptyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HTMLEmptyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml
index 3f8ce6b0677..4bc530ca1b3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -45,6 +48,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDeleteTest.xml
index e510dcdf179..24f1b3d5932 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDuplicateTest.xml
index fe2e3cf83fe..d46ffadbcbb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlMoveTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlMoveTest.xml
index 35692b4db9f..aafca072db8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlMoveTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlMoveTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HtmlMoveTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-html"/>
             <group value="pagebuilder-column"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlNoRequiredAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlNoRequiredAttributesTest.xml
index 6176e84e9b4..0822b15db9a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlNoRequiredAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlNoRequiredAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlUpdateAdvancedConfigurationValuesTest.xml
index 15f9523ff86..c29af02321d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateAdvancedConfigurationDefaultValuesTest.xml
index 00e301bd879..22af1e38f47 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="HtmlValidateAdvancedConfigurationDefaultValuesTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateGeneralDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateGeneralDefaultValuesTest.xml
index 1ca6ba99d89..c863f212a78 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateGeneralDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlValidateGeneralDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlVerifyUpdatingDuplicateDoesNotAffectInitialTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlVerifyUpdatingDuplicateDoesNotAffectInitialTest.xml
index 300466ad904..98e0b01fe7a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlVerifyUpdatingDuplicateDoesNotAffectInitialTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlVerifyUpdatingDuplicateDoesNotAffectInitialTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlDefaultStateTest.xml
index f3b27f3798a..3e166e37938 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-html"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlTest.xml
index 11243c6ea23..eaa921c38a5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/ValidateShowHideOnHtmlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-html"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateColumnWithImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateColumnWithImageTest.xml
index d80c3f56b00..a66066e0630 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateColumnWithImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateColumnWithImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DuplicateColumnWithImageTest">
@@ -17,9 +17,13 @@
             <testCaseId value="MC-5021"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -35,6 +39,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateRowWithImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateRowWithImageTest.xml
index d5bb4a526c8..5deb640aaa5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateRowWithImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateRowWithImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-5013"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -36,6 +40,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml
index aaa51c15a29..2f500bd735b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,16 @@
             <testCaseId value="MC-5022"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
+
+            <!--  TODO: pr_exclude group must be removed when AC-9371 is resolved  -->
+            <group value="pr_exclude" />
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -36,6 +43,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -67,8 +77,8 @@
         <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unfocusTabOptions"/>
         <!-- Validate Tab Item is duplicated -->
         <comment userInput="Validate Tab Item is duplicated" stepKey="commentValidateTabItemDuplicateOnStage"/>
-        <seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
-        <seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2"/>
+        <waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2"/>
         <!-- Duplicate Tab Group -->
         <comment userInput="Duplicate Tab Group" stepKey="commentDuplicateTabGroup"/>
         <actionGroup ref="duplicateContentType" stepKey="duplicateTabGroup">
@@ -76,56 +86,56 @@
         </actionGroup>
         <!-- Validate Tab Group is duplicated -->
         <comment userInput="Validate Tab Group is duplicated" stepKey="commentValidateTabGroupDuplicateOnStage"/>
-        <seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
-        <seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
-        <seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
+        <waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup1"/>
+        <waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3"/>
         <click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4Stage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
-        <seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
+        <waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4"/>
         <!-- Stage: Validate After Save -->
         <comment userInput="Stage: Validate After Save" stepKey="CommentValidateOnStageAfterSave"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
-        <seeElement selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
-        <seeElement selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
+        <waitForElementVisible selector="{{TabsOnStage.base('1')}}" stepKey="seeTabGroup1AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('1')}}" stepKey="seeTab1AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('1')}}" stepKey="seeImage1AfterSave"/>
         <actionGroup ref="switchTabs" stepKey="switchToTab2StageAfterSave">
             <argument name="section" value="TabOnStage"/>
             <argument name="from" value="1"/>
             <argument name="to" value="2"/>
         </actionGroup>
-        <seeElement selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
-        <seeElement selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
-        <seeElement selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('2')}}" stepKey="seeTab2AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('2')}}" stepKey="seeImage2AfterSave"/>
+        <waitForElementVisible selector="{{TabsOnStage.base('2')}}" stepKey="seeTabGroup2AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('3')}}" stepKey="seeTab3AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('3')}}" stepKey="seeImage3AfterSave"/>
         <click selector="{{TabOnStage.tabHeader('4')}}" stepKey="switchToTab4StageAfterSave"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <seeElement selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
-        <seeElement selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
+        <waitForElementVisible selector="{{TabOnStage.base('4')}}" stepKey="seeTab4AfterSave"/>
+        <waitForElementVisible selector="{{ImageOnStage.base('4')}}" stepKey="seeImage4AfterSave"/>
         <!-- Validate content type is duplicated in Storefront -->
         <comment userInput="Validate content type is duplicated in Storefront" stepKey="commentValidateDuplicatedStorefront"/>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront">
             <argument name="contentType" value="PageBuilderImageContentType"/>
         </actionGroup>
-        <seeElement selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
-        <seeElement selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
+        <waitForElementVisible selector="{{TabsOnFrontend.base('1')}}" stepKey="seeTabGroup1Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('1')}}" stepKey="seeTab1Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('1')}}" stepKey="seeImage1Storefront"/>
         <actionGroup ref="switchTabs" stepKey="switchToTab2Storefront">
             <argument name="section" value="TabOnStorefront"/>
             <argument name="from" value="1"/>
             <argument name="to" value="2"/>
         </actionGroup>
-        <seeElement selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
-        <seeElement selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
-        <seeElement selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('2')}}" stepKey="seeTab2Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('2')}}" stepKey="seeImage2Storefront"/>
+        <waitForElementVisible selector="{{TabsOnFrontend.base('2')}}" stepKey="seeTabGroup2Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('3')}}" stepKey="seeTab3Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('3')}}" stepKey="seeImage3Storefront"/>
         <click selector="{{TabOnStorefront.tabHeader('4')}}" stepKey="switchToTab4Storefront"/>
         <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <seeElement selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
-        <seeElement selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
+        <waitForElementVisible selector="{{TabOnStorefront.base('4')}}" stepKey="seeTab4Storefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.base('4')}}" stepKey="seeImage4Storefront"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml
index 0170b743eb5..24f9cbd1255 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -56,6 +59,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
                 <argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -175,6 +181,6 @@
             <argument name="cssProperty" value="maxWidth"/>
         </actionGroup>
         <see userInput="{{PageBuilderImageCaptionProperty.value}}" selector="{{ImageOnStorefront.imageCaption('1')}}" stepKey="seeCaptionDisplayedOnStorefrontMobile"/>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageIntoPageBuilderStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageIntoPageBuilderStageTest.xml
index 9141f8bc63c..36e84e9270d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageIntoPageBuilderStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageIntoPageBuilderStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-1334"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderImageProperty_JPG2"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddSameNameImageIntoPageBuilderStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddSameNameImageIntoPageBuilderStageTest.xml
new file mode 100644
index 00000000000..3c2810f3567
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddSameNameImageIntoPageBuilderStageTest.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ImageAddSameNameImageIntoPageBuilderStageTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Image"/>
+            <title value="Add Image with same name in PageBuilder for new CMS page and view on Storefront"/>
+            <description value="Upload and select an image to/from Magento Media Gallery from the Image content type in the Page Builder Stage and then delete it and re-upload a different image with same name."/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="ACP2E-2957"/>
+            <testCaseId value="AC-11732"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-image"/>
+            <group value="cloud"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+        </before>
+        <after>
+            <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage2">
+                <argument name="CMSPage" value="$$createCMSPage$$"/>
+            </actionGroup>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
+            <actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage2">
+                <argument name="contentType" value="PageBuilderImageContentType"/>
+                <argument name="x" value="0"/>
+                <argument name="y" value="0"/>
+            </actionGroup>
+            <comment stepKey="deleteImageB" userInput="Delete image B"/>
+            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
+                <argument name="Image" value="PageBuilderImagePropertyJpgCopyOtherFolder"/>
+            </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" />
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Go to CMS Page in Admin -->
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+
+        <!-- Switch to PageBuilder stage -->
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+
+        <!-- Add a row to PageBuilder stage with image -->
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+        </actionGroup>
+
+        <!-- Attach image A to PageBuilder stage -->
+        <comment userInput="Attach image A to PageBuilder stage" stepKey="commentAttachImage"/>
+        <comment userInput="Upload image from stage" stepKey="uploadImageFromStage"/>
+        <actionGroup ref="uploadImageToContentTypeFromStage" stepKey="addImageToStage">
+            <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
+            <argument name="section" value="ImageOnStageWithoutImageUploaded"/>
+        </actionGroup>
+
+        <!-- Go to Media Storage from stage -->
+        <comment userInput="Go to Media Storage from stage" stepKey="commentGoToMediaStorageFromStage1"/>
+        <actionGroup ref="goToMediaStorageFromStage" stepKey="goToMediaStorageFromStage1">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+            <argument name="x" value="0"/>
+            <argument name="y" value="0"/>
+        </actionGroup>
+
+        <!-- Delete image A -->
+        <comment stepKey="deleteImageA" userInput="Delete image A"/>
+        <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
+            <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
+        </actionGroup>
+
+        <!-- Select image B from Media Gallery -->
+        <comment userInput="Attach image B from Media Gallery" stepKey="attachImageToSlideOut"/>
+        <actionGroup ref="InsertImageFromMediaGalleryFromCmsActionGroup" stepKey="insertImageFromMediaGallery">
+            <argument name="imageFileName" value="{{PageBuilderImagePropertyJpgCopyOtherFolder.fileName}}"/>
+            <argument name="imageFilePath" value="{{PageBuilderImagePropertyJpgCopyOtherFolder.file}}"/>
+        </actionGroup>
+
+        <!-- Save Cms Page -->
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+
+        <!-- Go to Storefront -->
+        <actionGroup ref="StorefrontGoToCMSPageActionGroup" stepKey="goToCMSPageOnStorefrontAsGuest">
+            <argument name="identifier" value="$createCMSPage.identifier$"/>
+        </actionGroup>
+
+        <!-- Validate Storefront -->
+        <comment userInput="Validate Storefront" stepKey="commentValidateStorefront"/>
+        <waitForElementVisible selector="{{ImageOnStorefront.imageSourceByIndex('1', PageBuilderImagePropertyJpgCopyOtherFolder.fileName)}}" stepKey="seeImage2SourceOnStorefront"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddToImageBannerSliderAndReplaceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddToImageBannerSliderAndReplaceTest.xml
new file mode 100644
index 00000000000..3656606d7ae
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddToImageBannerSliderAndReplaceTest.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ImageAddToImageBannerSliderAndReplaceTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Image"/>
+            <title value="Add Missing Image Upload functionality to all media components that support image upload in PageBuilder"/>
+            <description value="Add Missing Upload Image button for new Media Image, Banner and Slider and allow replacement of image in PageBuilder."/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="ACP2E-3122"/>
+            <testCaseId value="AC-12646"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-image"/>
+            <group value="cloud"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+        </before>
+        <after>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage" />
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Go to CMS Page in Admin -->
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+
+        <!-- Switch to PageBuilder stage -->
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+
+        <!-- Add a row to PageBuilder stage with image -->
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragImageIntoStage">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+        </actionGroup>
+
+        <!-- Attach image to PageBuilder stage -->
+        <comment userInput="Upload image from stage" stepKey="uploadImageFromStage"/>
+        <actionGroup ref="uploadImageToContentTypeFromStage" stepKey="addImageToStage">
+            <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
+            <argument name="section" value="ImageOnStageWithoutImageUploaded"/>
+        </actionGroup>
+
+        <!-- Reattach image to PageBuilder stage -->
+        <comment userInput="Reattach image from stage" stepKey="uploadImageFromStage2"/>
+        <actionGroup ref="UploadNewImageToContentTypeFromStageActionGroup" stepKey="addImageToStage2">
+            <argument name="property" value="PageBuilderBackgroundImage_JPG"/>
+            <argument name="section" value="ImageOnStageWithoutImageUploaded"/>
+        </actionGroup>
+
+        <!-- Remove Image Content -->
+        <comment userInput="Remove Image Content" stepKey="commentRemoveImageContent"/>
+        <actionGroup ref="removeContentTypeFromStage" stepKey="removeImageContentTypeFromStage">
+            <argument name="contentType" value="PageBuilderImageContentType"/>
+        </actionGroup>
+
+        <!-- Add Banner -->
+        <comment userInput="Add Banner" stepKey="commentAddBanner"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragBannerIntoStage">
+            <argument name="contentType" value="PageBuilderBannerContentType"/>
+        </actionGroup>
+
+        <!-- Verify On Hover Upload Button Work-->
+        <comment userInput="Verify On Hover Upload Buttons Work" stepKey="commentVerifyButtonsOnBanner"/>
+        <actionGroup ref="unFocusOptionMenu" stepKey="unFocusOptionMenuOnBanner">
+            <argument name="contentType" value="PageBuilderBannerContentType"/>
+        </actionGroup>
+
+        <!-- Attach image to Banner in PageBuilder stage -->
+        <comment userInput="Attach image to Banner in PageBuilder stage" stepKey="commentAttachImageToBanner"/>
+        <actionGroup ref="UploadNewBackgroundImageToContentTypeFromStageActionGroup" stepKey="addImageToBannerFromStage">
+            <argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
+            <argument name="section" value="BannerOnBackend"/>
+        </actionGroup>
+
+        <!-- Reattach image to Banner in PageBuilder stage -->
+        <comment userInput="Reattach image to Banner in PageBuilder stage" stepKey="commentReattachImageToBanner"/>
+        <actionGroup ref="UploadNewBackgroundImageToContentTypeFromStageActionGroup" stepKey="addNewImageToBannerFromStage">
+            <argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
+            <argument name="section" value="BannerOnBackend"/>
+        </actionGroup>
+
+        <!-- Remove Banner Content -->
+        <comment userInput="Remove Banner Content" stepKey="commentRemoveBannerContent"/>
+        <actionGroup ref="removeContentTypeFromStage" stepKey="removeBannerContentTypeFromStage">
+            <argument name="contentType" value="PageBuilderBannerContentType"/>
+        </actionGroup>
+
+        <!-- Add Slider -->
+        <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragSliderIntoStage">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
+        </actionGroup>
+
+        <!-- Verify On Hover Upload Button Work-->
+        <comment userInput="Verify On Hover Upload Buttons Work" stepKey="commentVerifyButtonsOnSlider"/>
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="unFocusSlider"/>
+        <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
+        </actionGroup>
+
+        <!-- Attach image to Slider in PageBuilder stage -->
+        <actionGroup ref="UploadNewBackgroundImageToContentTypeFromStageActionGroup" stepKey="addNewImageToSliderFromStage">
+            <argument name="backgroundImage" value="PageBuilderBackgroundImage_JPG"/>
+            <argument name="section" value="SlideOnBackend"/>
+        </actionGroup>
+
+        <!-- Remove Slider Content -->
+        <comment userInput="Remove Slider Content" stepKey="commentRemoveSliderContent"/>
+        <actionGroup ref="removeContentTypeFromStage" stepKey="removeSliderContentTypeFromStage">
+            <argument name="contentType" value="PageBuilderSliderContentType"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddEmptyImagePreviewTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddEmptyImagePreviewTest.xml
index d9c35bab6f5..acc9de3d6da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddEmptyImagePreviewTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddEmptyImagePreviewTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddToColumnTest.xml
index 30a39b167e2..893b0ce3594 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ImageCanAddToColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCannotAddToStageTest.xml
index 6e25651066e..316351e06f6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCaptionDoesNotRenderHtmlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCaptionDoesNotRenderHtmlTest.xml
index fd87149c27a..aeb16ae4d89 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCaptionDoesNotRenderHtmlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCaptionDoesNotRenderHtmlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
         </before>
         <after>
@@ -32,6 +35,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageDuplicateTest.xml
index 7b44356c8d9..37f136d9e7b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-3598"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -36,6 +40,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageHasNoRequiredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageHasNoRequiredTest.xml
index 7b7c810a412..c586c090aaf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageHasNoRequiredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageHasNoRequiredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageInvalidFileTypeValidationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageInvalidFileTypeValidationTest.xml
index f14ecb0416d..c24e6e517c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageInvalidFileTypeValidationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageInvalidFileTypeValidationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -17,6 +17,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageRemoveImageFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageRemoveImageFromStageTest.xml
index c0152f895fe..da5198312ff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageRemoveImageFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageRemoveImageFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageTestCMSPageOnTabletTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageTestCMSPageOnTabletTest.xml
index 93d71e4d6f6..4014cd3718e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageTestCMSPageOnTabletTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageTestCMSPageOnTabletTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,12 +18,16 @@
             <testCaseId value="MC-42373"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderImageProperty_JPG2.path}}"/>
@@ -31,6 +35,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_JPG2"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
 
@@ -87,12 +94,12 @@
         <dontSeeElement selector="{{ImageOnStorefront.imageMobile('1')}}" stepKey="dontSeeMobileImageOnDefaultRes"/>
 
         <!-- Validate images with window width of 768px -->
-        <resizeWindow width="769" height="1024" stepKey="resizeWindowTo768by1024"/>
+        <resizeWindow width="768" height="1024" stepKey="resizeWindowTo768by1024"/>
         <seeElement selector="{{ImageOnStorefront.imageDesktop('1')}}" stepKey="seeMainImageOn768by1024"/>
         <dontSeeElement selector="{{ImageOnStorefront.imageMobile('1')}}" stepKey="dontSeeMobileImageOn768by1024"/>
 
         <!-- Validate images with window width of 767px -->
-        <resizeWindow width="768" height="1024" stepKey="resizeWindowTo767by1024"/>
+        <resizeWindow width="767" height="1024" stepKey="resizeWindowTo767by1024"/>
         <seeElement selector="{{ImageOnStorefront.imageMobile('1')}}" stepKey="seeMobileImageOn767by1024"/>
         <dontSeeElement selector="{{ImageOnStorefront.imageDesktop('1')}}" stepKey="dontSeeDesktopImageOn767by1024"/>
     </test>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUpdateAdvancedConfigurationValuesTest.xml
index 1cf1f3fc6e3..f3ab9770c9f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-2568"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -36,6 +40,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadImageWithSecretKeyEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadImageWithSecretKeyEnabledTest.xml
index 21729ad3776..53e5b6069f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadImageWithSecretKeyEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadImageWithSecretKeyEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadIsHiddenWhenDisabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadIsHiddenWhenDisabledTest.xml
index 18c9ea2c051..3181ee9b013 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadIsHiddenWhenDisabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadIsHiddenWhenDisabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageValidateAdvancedConfigurationDefaultValuesTest.xml
index 7f8f697e5c1..a02de2548c9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ImageValidateAdvancedConfigurationDefaultValuesTest">
@@ -20,6 +20,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -35,6 +38,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageDefaultStateTest.xml
index bfe713fb95f..15f973acc9a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageTest.xml
index b25809eb527..7c4354519ca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <closeTab stepKey="closeOpenedTab"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddAllAttributesTest.xml
index 23bb28cb7b2..155839ef1b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddToColumnTest.xml
index 6edb6de3c8e..0fb26d6522a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="MapAddToColumnTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-map"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapCannotAddToStageTest.xml
index 6ae821bd24f..ca56466e986 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-mapCommon"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDefaultStateTest.xml
index 73ec0009ecd..ffe680bd596 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDeleteTest.xml
index e8f6d4c62e2..7e5a86781b6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDuplicateTest.xml
index 19d69103f4a..9f25aafbb57 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapMoveMapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapMoveMapTest.xml
index d917c0d93ce..a2f099d9274 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapMoveMapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapMoveMapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="MapMoveMapTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapUpdateAdvancedConfigurationValuesTest.xml
index 6bf38d48bd4..cb85c59f7b0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapValidateAdvancedConfigurationDefaultValuesTest.xml
index d0bf0d4eaa3..7c5036c0e47 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="MapValidateAdvancedConfigurationDefaultValuesTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapVerifyOnHoverOptionMenuTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapVerifyOnHoverOptionMenuTest.xml
index ed92d31bcec..52a053b2dc5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapVerifyOnHoverOptionMenuTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapCommonComponentTest/MapVerifyOnHoverOptionMenuTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithEmptyAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithEmptyAPIKeyTest.xml
index d5886b69932..947b53afa6b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithEmptyAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithEmptyAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithInvalidAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithInvalidAPIKeyTest.xml
index 72e1e7c36d5..c0f0dda1e7b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithInvalidAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanAddNewLocationWithInvalidAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithEmptyAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithEmptyAPIKeyTest.xml
index 3d16d2a2b7d..9582153f06e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithEmptyAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithEmptyAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithInvalidAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithInvalidAPIKeyTest.xml
index 996fdd6de34..c18955bc44e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithInvalidAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanDeleteLocationWithInvalidAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithEmptyAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithEmptyAPIKeyTest.xml
index eb9e710ee05..f9bb8cc7c44 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithEmptyAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithEmptyAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithInvalidAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithInvalidAPIKeyTest.xml
index 176d77a6e9a..31301cfe116 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithInvalidAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapCanEditLocationWithInvalidAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapDoesNotRenderNewGoogleMapsStyleOnStorefrontUntilPageSaveOrCacheRefreshTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapDoesNotRenderNewGoogleMapsStyleOnStorefrontUntilPageSaveOrCacheRefreshTest.xml
index 65151fd833e..7a5dcd2788a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapDoesNotRenderNewGoogleMapsStyleOnStorefrontUntilPageSaveOrCacheRefreshTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapDoesNotRenderNewGoogleMapsStyleOnStorefrontUntilPageSaveOrCacheRefreshTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -115,7 +115,9 @@
         </assertEquals>
         <!-- Clean Cache -->
         <comment userInput="Clean Cache" stepKey="commentCleanCache"/>
-        <magentoCLI command="cache:clean" stepKey="cleanCache"/>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+            <argument name="tags" value=""/>
+        </actionGroup>
         <actionGroup ref="navigateToStoreFront" stepKey="navigateToStoreFront5">
             <argument name="contentType" value="PageBuilderMapContentType"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageLinkTest.xml
index 2ed4859dd87..78d0d590ef6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-googleMapsAPIKey"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/pagebuilder/google_maps_api_key ''" stepKey="setEmptyGoogleMapsAPIKey"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageTest.xml
index e22c965738e..268e8747bfe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapEmptyAPIKeyWarningMessageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageLinkTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageLinkTest.xml
index 5ac6baa5f85..1164577bfef 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageLinkTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageLinkTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageTest.xml
index fb3e5c66b43..4cb276195a7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapInvalidAPIKeyWarningMessageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapRendersNewGoogleMapsStyleOnStageImmediatelyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapRendersNewGoogleMapsStyleOnStageImmediatelyTest.xml
index 837bdd653cc..6ed8314b973 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapRendersNewGoogleMapsStyleOnStageImmediatelyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTest/MapRendersNewGoogleMapsStyleOnStageImmediatelyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-googleMapsStyle"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/pagebuilder/google_maps_style ''" stepKey="setEmptyGoogleMapsStyle"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCityValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCityValidCharacterSetsTest.xml
index 241d64aaf77..a6433799563 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCityValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCityValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCommentValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCommentValidCharacterSetsTest.xml
index b6524dee84d..1d12ec14018 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCommentValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCommentValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCountryValidCaseTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCountryValidCaseTest.xml
index 0d6ce9e8dc2..9454228ce21 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCountryValidCaseTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapCountryValidCaseTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLatitudeInvalidInputsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLatitudeInvalidInputsTest.xml
index b42893ec992..b15e594d9d0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLatitudeInvalidInputsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLatitudeInvalidInputsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationAttributesDoNotRenderHtmlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationAttributesDoNotRenderHtmlTest.xml
index fb1e0da1565..914176d0060 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationAttributesDoNotRenderHtmlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationAttributesDoNotRenderHtmlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameInvalidInputsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameInvalidInputsTest.xml
index 0f3d410ed14..39a09a2a138 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameInvalidInputsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameInvalidInputsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-mapLocation"/>
             <group value="pagebuilder-mapLocationAttributes"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameValidCharacterSetsTest.xml
index 30df307a90c..f577012c5a5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLocationNameValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLongitudeInvalidInputsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLongitudeInvalidInputsTest.xml
index 09bcdb91f1e..e9fc68b5917 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLongitudeInvalidInputsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapLongitudeInvalidInputsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapPhoneNumberValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapPhoneNumberValidCharacterSetsTest.xml
index 48e54af5ba7..18d974ae3c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapPhoneNumberValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapPhoneNumberValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStateValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStateValidCharacterSetsTest.xml
index edf5e4f88b2..03d1826d9bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStateValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStateValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStreetAddressValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStreetAddressValidCharacterSetsTest.xml
index 2eac53ccf73..589d1c1c0b6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStreetAddressValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapStreetAddressValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapZipValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapZipValidCharacterSetsTest.xml
index 905581dcef2..3f7d88147d0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapZipValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationAttributeTest/MapZipValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapDeleteLocationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapDeleteLocationTest.xml
index 9b6ba3bafe6..7d1bc3421b7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapDeleteLocationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapDeleteLocationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapEditAllLocationAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapEditAllLocationAttributesTest.xml
index ae009176bcc..48d6ed29999 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapEditAllLocationAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapEditAllLocationAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridAppearanceTest.xml
index 4bcda93a567..4c8f71e5ad5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridCancelRowSortOrderChangesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridCancelRowSortOrderChangesTest.xml
index 51ca9909c05..002d19b3913 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridCancelRowSortOrderChangesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridCancelRowSortOrderChangesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridNewLocationsCorrectSortOrderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridNewLocationsCorrectSortOrderTest.xml
index 69cf998ba45..57870787aae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridNewLocationsCorrectSortOrderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridNewLocationsCorrectSortOrderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridRowSortingForEachColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridRowSortingForEachColumnTest.xml
index fbf932cf476..da888bcfb50 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridRowSortingForEachColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridRowSortingForEachColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridSaveRowSortOrderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridSaveRowSortOrderTest.xml
index 31c64018994..e5c2c880bb0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridSaveRowSortOrderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapLocationsGridSaveRowSortOrderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapVerifyEditButtonOnLocationsGridTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapVerifyEditButtonOnLocationsGridTest.xml
index a75247ff8b4..492bb7ec3c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapVerifyEditButtonOnLocationsGridTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapLocationTest/MapVerifyEditButtonOnLocationsGridTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapLocation"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightInvalidInputsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightInvalidInputsTest.xml
index 0f2396fbe8f..a437252a8bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightInvalidInputsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightInvalidInputsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-map"/>
             <group value="pagebuilder-mapMapSettings"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightValidCharacterSetsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightValidCharacterSetsTest.xml
index 41a2562ebdf..da5d4298a09 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightValidCharacterSetsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapHeightValidCharacterSetsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapShowControlsEnabledAndDisabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapShowControlsEnabledAndDisabledTest.xml
index 608892429f0..01d5ed5af62 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapShowControlsEnabledAndDisabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapMapSettingsAttributesTest/MapShowControlsEnabledAndDisabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsOppositeSidesOfWorldTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsOppositeSidesOfWorldTest.xml
index e4cb76dae78..045c983c8d3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsOppositeSidesOfWorldTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsOppositeSidesOfWorldTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsWithSameCoordinatesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsWithSameCoordinatesTest.xml
index 58407eb735e..69cc96865b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsWithSameCoordinatesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/Map2LocationsWithSameCoordinatesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinThenRemoveThenAddTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinThenRemoveThenAddTest.xml
index bd3a893973f..be56a58bb47 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinThenRemoveThenAddTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinThenRemoveThenAddTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByClickingOnMapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByClickingOnMapTest.xml
index d7dd0a8ac30..adf3cfc8234 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByClickingOnMapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByClickingOnMapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByInputtingCoordinatesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByInputtingCoordinatesTest.xml
index 22f9a753774..ccca719afb1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByInputtingCoordinatesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapAddPinToMapByInputtingCoordinatesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByChangingCoordinatesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByChangingCoordinatesTest.xml
index 0a5b88e032d..0788ccddbb7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByChangingCoordinatesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByChangingCoordinatesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -27,7 +27,9 @@
         </annotations>
         <before>
             <magentoCLI command="config:set cms/pagebuilder/google_maps_api_key {{googleMapsAPIKey.valid}}" stepKey="setValidGoogleMapsAPIKey"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByClickingOnMapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByClickingOnMapTest.xml
index 83649df2874..b023a13ee96 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByClickingOnMapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByClickingOnMapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinOffOfMapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinOffOfMapTest.xml
index b85614ef657..e067c9c9619 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinOffOfMapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinOffOfMapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinTest.xml
index 80ccb0cb896..e06482d8fa9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapMoveMapPinByDraggingAndDroppingPinTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipAllLocationDataTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipAllLocationDataTest.xml
index c71fde19ad2..63346e20c99 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipAllLocationDataTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipAllLocationDataTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipWindowStaysOpenWhenPanningOnMapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipWindowStaysOpenWhenPanningOnMapTest.xml
index 1e0bf8eacb8..da7f9e9a1d2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipWindowStaysOpenWhenPanningOnMapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapPinTest/MapPinTooltipWindowStaysOpenWhenPanningOnMapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderNoTimeoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderNoTimeoutTest.xml
new file mode 100644
index 00000000000..e3342aa0d87
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderNoTimeoutTest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminPageBuilderNoTimeoutTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="PageBuilder Performance"/>
+            <title value="PageBuilder should not timeout on save"/>
+            <description value="PageBuilder should not take more than 5s to generate content source"/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="ACP2E-2016"/>
+            <testCaseId value="AC-9079"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-cms-page"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <executeJS function="
+((logger, storage) => {
+    let _super = logger.error;
+    logger.error = function (...args) {
+        let records = storage.getItem('consoleErrors') ? JSON.parse(storage.getItem('consoleErrors')) : [];
+        records.push(...args.filter(arg => typeof arg === 'string'));
+        storage.setItem('consoleErrors', JSON.stringify(records));
+        _super.apply(logger, args);
+    };
+})(window.console, window.sessionStorage)
+" stepKey="storeConsoleErrorsInSessionStorage"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection2">
+            <argument name="contentType" value="PageBuilderHeadingContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragHeadingIntoStage">
+            <argument name="contentType" value="PageBuilderHeadingContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
+            <argument name="contentType" value="PageBuilderTextContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragTextIntoStage">
+            <argument name="contentType" value="PageBuilderTextContentType"/>
+        </actionGroup>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+        <executeJS function="return sessionStorage.getItem('consoleErrors') || ''" stepKey="getConsoleErrors"/>
+        <assertStringNotContainsString stepKey="assertConsoleErrors">
+            <expectedResult type="string">Page Builder was rendering for 5 seconds without releasing locks.</expectedResult>
+            <actualResult type="variable">getConsoleErrors</actualResult>
+        </assertStringNotContainsString>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ActivatePageBuilderFullScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ActivatePageBuilderFullScreenTest.xml
index 1ed6c98dab7..2a00c2c0c46 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ActivatePageBuilderFullScreenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ActivatePageBuilderFullScreenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ClearSearchInPanelTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ClearSearchInPanelTest.xml
index 1774e132b85..a2d348d78c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ClearSearchInPanelTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ClearSearchInPanelTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/HeaderFixedInFullScreenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/HeaderFixedInFullScreenTest.xml
index d847c4496d0..c499e8504a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/HeaderFixedInFullScreenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/HeaderFixedInFullScreenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchContentTypeAndAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchContentTypeAndAddToStageTest.xml
index 1c68fd36828..e2f21078a49 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchContentTypeAndAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchContentTypeAndAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SearchContentTypeAndAddToStageTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchNoMatchesInPanelTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchNoMatchesInPanelTest.xml
index fa93cb07a85..87550765301 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchNoMatchesInPanelTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchNoMatchesInPanelTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchOneCharInPanelTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchOneCharInPanelTest.xml
index 310bcee3389..a13226ed0ff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchOneCharInPanelTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchOneCharInPanelTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchRemovedContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchRemovedContentTypeTest.xml
index 13defe72c87..ad786c2db65 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchRemovedContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchRemovedContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchSpecialCharactersInPanelTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchSpecialCharactersInPanelTest.xml
index 0f32990eca4..85e24ec3f92 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchSpecialCharactersInPanelTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchSpecialCharactersInPanelTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchThreeCharInPanelTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchThreeCharInPanelTest.xml
index f6e60ae5670..5b69e451e4d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchThreeCharInPanelTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/SearchThreeCharInPanelTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ShowPanelMenuSectionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ShowPanelMenuSectionsTest.xml
index 2e5f7f236dc..3be091662ea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ShowPanelMenuSectionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ShowPanelMenuSectionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-4053"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypeIconsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypeIconsTest.xml
index bf0efc8999f..08877bfc81b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypeIconsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypeIconsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypesGroupedCorrectlyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypesGroupedCorrectlyTest.xml
index c7de48a83d1..7e8b62133c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypesGroupedCorrectlyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelContentTypesGroupedCorrectlyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2897"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelDefaultStateTest.xml
index 1e894cd17e3..82fa42371a2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelStickinessTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelStickinessTest.xml
index 7e2ac7e2036..286ec0fd066 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelStickinessTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderPanelTest/ValidatePanelStickinessTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-3200"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-panel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAllProductsShowWhenSavedWithoutConditionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAllProductsShowWhenSavedWithoutConditionsTest.xml
index c6dc761953b..4e625e70962 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAllProductsShowWhenSavedWithoutConditionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAllProductsShowWhenSavedWithoutConditionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAndGridAppearanceSettingsPersistTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAndGridAppearanceSettingsPersistTest.xml
index 6140e5c4091..35e2f970e08 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAndGridAppearanceSettingsPersistTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselAndGridAppearanceSettingsPersistTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselCanBeSortedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselCanBeSortedTest.xml
index 6d27a332b2e..f5a0f26d60f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselCanBeSortedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselCanBeSortedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselDoesNotAppearOnFrontendWhenNotConfiguredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselDoesNotAppearOnFrontendWhenNotConfiguredTest.xml
index b21609daf61..42e4a8555f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselDoesNotAppearOnFrontendWhenNotConfiguredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselDoesNotAppearOnFrontendWhenNotConfiguredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel" after="dragProductsIntoStage">
             <argument name="contentType" value="PageBuilderProductsContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectByCategoryAndSortByPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectByCategoryAndSortByPositionTest.xml
index 9b13a21bc31..b00d1b8a1b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectByCategoryAndSortByPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectByCategoryAndSortByPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndSortByPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndSortByPositionTest.xml
index e79714ff254..5d540fb2c86 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndSortByPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndSortByPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml
index 5f37273467d..40a449ed86e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
index 3be9535207d..3b169ceeebf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest.xml
new file mode 100644
index 00000000000..a19542129e1
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminPageBuilderProductsCarouselSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest" extends="AdminPageBuilderProductsSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Products"/>
+            <title value="Carousel - Select Products By SKU with special characters, delete one product, verify product is displayed in the content preview and storefront"/>
+            <description value="Verify that a product is shown in the content preview and storefront if the content type is filtered by 'Select By SKU' and the SKU contains special characters"/>
+            <severity value="MINOR"/>
+            <useCaseId value="ACP2E-1444"/>
+            <testCaseId value="AC-7587"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-products"/>
+            <group value="pagebuilder-productsCarousel"/>
+        </annotations>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
+            <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
+        </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount">
+            <argument name="property" value="PageBuilderProductsCarouselCountPropertyFour"/>
+        </actionGroup>
+        <actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage">
+            <argument name="page" value="ProductsCarouselOnStage"/>
+            <argument name="count" value="1"/>
+        </actionGroup>
+        <actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage">
+            <argument name="page" value="ProductsCarouselOnStage"/>
+            <argument name="product" value="ProductWithSpecialCharsInSKU"/>
+            <argument name="productIndex" value="1"/>
+        </actionGroup>
+        <actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage2">
+            <argument name="page" value="ProductsCarouselOnStage"/>
+            <argument name="count" value="1"/>
+        </actionGroup>
+        <actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage2">
+            <argument name="page" value="ProductsCarouselOnStage"/>
+            <argument name="product" value="ProductWithSpecialCharsInSKU"/>
+            <argument name="productIndex" value="1"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsDisableArrowsAndDotsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsDisableArrowsAndDotsTest.xml
index c19c81405f2..e0c0954c97f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsDisableArrowsAndDotsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsDisableArrowsAndDotsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsSectionDefaultsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsSectionDefaultsTest.xml
index cad2f7ff719..3e549a78037 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsSectionDefaultsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsSectionDefaultsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithSixProductsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithSixProductsTest.xml
index 0cb9cb6a3c8..6ce15b7f1bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithSixProductsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithSixProductsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
@@ -251,6 +252,8 @@
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
+        <!-- Moving mouse over logo to make sure we aren't hovering over some product that should be 50% transparent  -->
+        <moveMouseOver selector="{{StorefrontHeaderSection.logoLink}}" stepKey="moveMouseOverLogo" />
         <actionGroup ref="validateProductCarouselSettingsAttributes" stepKey="validateProductCarouselSettingsAttributesStorefront">
             <argument name="page" value="ProductsOnStorefront"/>
             <argument name="carouselMode" value="PageBuilderProductsCarouselSettingsCarouselMode_Continuous"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithThreeProductsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithThreeProductsTest.xml
index 674c6a2ce9e..5e14954f626 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithThreeProductsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateContinuousCarouselModeWithThreeProductsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateDefaultCarouselModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateDefaultCarouselModeTest.xml
index ff5294ec991..1d850180b77 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateDefaultCarouselModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateDefaultCarouselModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateInfiniteLoopArrowsDotsFunctionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateInfiniteLoopArrowsDotsFunctionTest.xml
index e9bb7be53eb..3daf71516cb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateInfiniteLoopArrowsDotsFunctionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSettingsValidateInfiniteLoopArrowsDotsFunctionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml
index ccd66fa8229..b86db9ee1b1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <after>
             <remove keyForRemoval="deleteCategory1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml
index a06007a6be7..2f764fa2cf0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselUpdateAdvancedConfigurationValuesTest.xml
index c9a62fabef0..4152466781b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest.xml
index ca019324a8f..3abbab31a38 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminPageBuilderProductsCarouselValidateAdvancedConfigurationDefaultValuesTest" extends="ProductsValidateAdvancedConfigurationDefaultValuesTest">
@@ -16,6 +16,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Select Product Carousel Appearance -->
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance" after="openEditAfterDrop">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAppearanceTest.xml
index bb24a84ca28..5af265a2642 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml
index 5fe74752ab0..d4b5e7c20e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInContinuousModeWithInfiniteLoopTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithInfiniteLoopTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithInfiniteLoopTest.xml
index 06488926d63..615b506d68b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithInfiniteLoopTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithInfiniteLoopTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="disableInfiniteLoop">
             <argument name="property" value="PageBuilderProductsCarouselSettingsInfiniteLoop_Enabled"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithNoInfiniteLoopTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithNoInfiniteLoopTest.xml
index b85823fc39a..0512287b949 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithNoInfiniteLoopTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateAutoplayInDefaultModeWithNoInfiniteLoopTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateCanSaveProductsWithEmptyConditionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateCanSaveProductsWithEmptyConditionsTest.xml
index 7a34b154254..1768821d641 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateCanSaveProductsWithEmptyConditionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateCanSaveProductsWithEmptyConditionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateNumberOfProductsFieldTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateNumberOfProductsFieldTest.xml
index 0bed0550398..d42e9076edc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateNumberOfProductsFieldTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateNumberOfProductsFieldTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInContinuousModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInContinuousModeTest.xml
index 85e98d252bf..f776e70e77f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInContinuousModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInContinuousModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectCarouselMode">
             <argument name="property" value="PageBuilderProductsCarouselSettingsCarouselMode_Continuous"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInDefaultModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInDefaultModeTest.xml
index c174b1624a4..5e5a83bfb0c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInDefaultModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselValidateProductsCenteredInAppearanceInDefaultModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyCanSlideCarouselTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyCanSlideCarouselTest.xml
index 460e08680e7..c498bd0b7fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyCanSlideCarouselTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyCanSlideCarouselTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeOneProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeOneProductTest.xml
index 8c48f66c617..6dc161fe92b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeOneProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeOneProductTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml
index e719bbc18a9..71bc3ce1142 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInContinuousCarouselModeSixProductsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
index 17b83e8ca72..ae67809b469 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselWrapsInsideTinyColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselWrapsInsideTinyColumnTest.xml
index 03cee23be26..b675cafdeaf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselWrapsInsideTinyColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsCarouselWrapsInsideTinyColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsForbiddenEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsForbiddenEditTest.xml
new file mode 100644
index 00000000000..d9f2274c68d
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderProductsForbiddenEditTest.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminPageBuilderProductsForbiddenEditTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Products"/>
+            <title value="Can't edit products widget"/>
+            <description value="Clicking products edit widget will display an error."/>
+            <severity value="MINOR"/>
+            <useCaseId value="AC-14344"/>
+            <testCaseId value="ACP2E-3664"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-products"/>
+            <group value="cloud"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCmsPage" stepKey="createCmsPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory"/>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct1">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <createData entity="_defaultProduct" stepKey="createPreReqProduct2">
+                <requiredEntity createDataKey="createPreReqCategory"/>
+            </createData>
+            <amOnPage url="{{AdminCmsPageEditPage.url($$createCmsPage.id$$)}}" stepKey="openEditCmsPage"/>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+            <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+                <argument name="contentType" value="PageBuilderRowContentType"/>
+                <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createPreReqProduct1" stepKey="deletePreReqProduct1"/>
+            <deleteData createDataKey="createPreReqProduct2" stepKey="deletePreReqProduct2"/>
+            <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
+            <deleteData createDataKey="createCmsPage" stepKey="deleteCreateCmsPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutExistingUser"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdminClean"/>
+            <!--Delete created user-->
+            <actionGroup ref="AdminDeleteUserActionGroup" stepKey="deleteRestrictedAdmin">
+                <argument name="user" value="NewAdminUser"/>
+            </actionGroup>
+            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilterAfterDeletingNewAdminUser"/>
+            <!--Delete created user role-->
+            <actionGroup ref="AdminDeleteCreatedRoleActionGroup" stepKey="deleteRestrictedRole">
+                <argument name="role" value="adminRole"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragProductsIntoStage">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy">
+            <argument name="property" value="PageBuilderProductsSelectProductsByCondition"/>
+        </actionGroup>
+        <actionGroup ref="addConditionToProductConditions" stepKey="addCategory">
+            <argument name="conditionInput" value="$$createPreReqCategory.id$$"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+
+        <!--Create user role with resource access-->
+        <actionGroup ref="AdminStartCreateUserRoleActionGroup" stepKey="startCreateUserRole">
+            <argument name="roleName" value="{{adminRole.name}}"/>
+            <argument name="userPassword" value="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}"/>
+            <argument name="resourceAccess" value="Custom"/>
+            <argument name="storeName" value="{{_defaultWebsite.name}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectUserRoleResourceActionGroup" stepKey="addCategoryAccess">
+            <argument name="resourceId" value="Magento_Catalog::categories_anchor"/>
+        </actionGroup>
+        <actionGroup ref="AdminSelectUserRoleResourceActionGroup" stepKey="addPageAccess">
+            <argument name="resourceId" value="Magento_Cms::page_anchor"/>
+        </actionGroup>
+        <actionGroup ref="AdminSaveUserRoleActionGroup" stepKey="saveRole"/>
+
+        <!--Create user role-->
+        <actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createRestrictedAdmin">
+            <argument name="role" value="adminRole"/>
+            <argument name="user" value="NewAdminUser"/>
+        </actionGroup>
+
+        <!-- Login as newly created admin user -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsRestrictedAdmin">
+            <argument name="username" value="{{NewAdminUser.username}}"/>
+            <argument name="password" value="{{NewAdminUser.password}}"/>
+        </actionGroup>
+
+        <amOnPage url="{{AdminCmsPageEditPage.url($$createCmsPage.id$$)}}" stepKey="openEditCmsPageSecond"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
+        <waitForElementVisible selector="{{AdminGridConfirmActionSection.message}}" stepKey="waitForConfirmModal"/>
+        <see selector="{{AdminGridConfirmActionSection.message}}" userInput="Sorry, you need permissions to view this content." stepKey="seeForbiddenMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderVerifySwatchDisplayedInPreviewCarouselTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderVerifySwatchDisplayedInPreviewCarouselTest.xml
index aff346837f5..56966eb8208 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderVerifySwatchDisplayedInPreviewCarouselTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCarouselTest/AdminPageBuilderVerifySwatchDisplayedInPreviewCarouselTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance" after="openEditAfterDrop">
             <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsCanSaveConditionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsCanSaveConditionTest.xml
index bebecd2ce14..e1b64176bc9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsCanSaveConditionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsCanSaveConditionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-4027"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationIsPersistentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationIsPersistentTest.xml
index 10ba86b2461..ca2a61f6480 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationIsPersistentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationIsPersistentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-4029"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml
index d8c145e5b96..cdef18405b2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-22882"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductCombinedConditionRuleWorksProperlyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductCombinedConditionRuleWorksProperlyTest.xml
index 99ae583ad44..8dc84a3c3a8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductCombinedConditionRuleWorksProperlyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductCombinedConditionRuleWorksProperlyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsAddDoubleConditionsCombinationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsAddDoubleConditionsCombinationTest.xml
index abf4f7e6e76..66bfca7335d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsAddDoubleConditionsCombinationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsAddDoubleConditionsCombinationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -16,6 +16,7 @@
             <severity value="MAJOR"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsInvulnerableToXSSTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsInvulnerableToXSSTest.xml
index 303b34df743..e462e6adfc9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsInvulnerableToXSSTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductConditionsInvulnerableToXSSTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-security"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml
index 847d1e275d7..5c2efec91c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductFromDifferentWebsiteShowsOnStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -33,14 +33,18 @@
                 <argument name="StoreGroup" value="customStoreGroup"/>
                 <argument name="customStore" value="customStore"/>
             </actionGroup>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set web/url/use_store 0" stepKey="turnOffStoreUrlUsage"/>
             <actionGroup ref="DeleteCustomWebsiteActionGroup" stepKey="deleteWebsite">
                 <argument name="websiteName" value="$createCustomWebsite.website[name]$"/>
             </actionGroup>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
             <actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory">
                 <argument name="categoryEntity" value="SimpleSubCategory"/>
             </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCanAddToColumnTest.xml
index a5bd2a3ba66..a56fc504261 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ProductsCanAddToColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCannotAddToStageTest.xml
index 5dc4ca84767..7c716af54a0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDeleteTest.xml
index 3da19148d9e..27a43d19b54 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDuplicateTest.xml
index 357fa264f44..b3f1f5f1a2f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsValidateAdvancedConfigurationDefaultValuesTest.xml
index 32dee8e350a..b01b9124c2e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductsValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ProductsValidateAdvancedConfigurationDefaultValuesTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ShowOutOfStockProductTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ShowOutOfStockProductTest.xml
index 8fd95952305..b3a9efb4974 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ShowOutOfStockProductTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ShowOutOfStockProductTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsDefaultStateTest.xml
index d48113313a1..7e8cfdf89b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsTest.xml
index 683e8d4bbac..6aeda17325d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ValidateShowHideOnProductsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsAllProductsShowWhenSavedWithoutConditionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsAllProductsShowWhenSavedWithoutConditionsTest.xml
index 00dfdc1761f..67fce2672c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsAllProductsShowWhenSavedWithoutConditionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsAllProductsShowWhenSavedWithoutConditionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsCanBeSortedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsCanBeSortedTest.xml
index a84a0d19f70..d198a9cdc15 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsCanBeSortedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsCanBeSortedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsDoesNotAppearOnFrontendWhenNotConfiguredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsDoesNotAppearOnFrontendWhenNotConfiguredTest.xml
index 5d4c89f5075..ee092d4daac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsDoesNotAppearOnFrontendWhenNotConfiguredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsDoesNotAppearOnFrontendWhenNotConfiguredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateAppearanceTest.xml
index 630783f4a18..830354d58ea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateCanSaveProductsWithEmptyConditionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateCanSaveProductsWithEmptyConditionsTest.xml
index 31e4d8559d0..3d7c04e5241 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateCanSaveProductsWithEmptyConditionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsGridValidateCanSaveProductsWithEmptyConditionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectByCategoryAndSortByPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectByCategoryAndSortByPositionTest.xml
index 6e0fc90da0f..7a78eb9c439 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectByCategoryAndSortByPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectByCategoryAndSortByPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createCategory1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndSortByPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndSortByPositionTest.xml
index b520b12516a..ed3e7b9fb45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndSortByPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndSortByPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml
index 8984c8e9c29..4c56c0c5a87 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
index 6d20f647dbc..eae52c9b6d3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUAndVerifyProductRemovedAfterSKUChangeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="PageBuilderProductsSubCategory" stepKey="createPreReqCategory"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest.xml
new file mode 100644
index 00000000000..94e152d78f1
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminPageBuilderProductsSelectBySKUWithSpecialCharacterAndVerifyProductIsDisplayedTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Products"/>
+            <title value="Grid - Select Products By SKU with special characters, delete one product, verify product is displayed in the content preview and storefront"/>
+            <description value="Verify that a product is shown in the content preview and storefront if the content type is filtered by 'Select By SKU' and the SKU contains special characters"/>
+            <severity value="MINOR"/>
+            <useCaseId value="ACP2E-1444"/>
+            <testCaseId value="AC-7586"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-products"/>
+            <group value="pagebuilder-productsGrid"/>
+        </annotations>
+        <before>
+            <createData entity="ProductWithSpecialCharsInSKU" stepKey="createProduct1"/>
+            <createData entity="SimpleProduct" stepKey="createProduct2"/>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="navigateToCMSPage" stepKey="navigateToCMSPage">
+                <argument name="CMSPage" value="$$createCMSPage$$"/>
+            </actionGroup>
+            <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+            <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+                <argument name="contentType" value="PageBuilderRowContentType"/>
+                <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+            </actionGroup>
+        </before>
+        <after>
+            <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragProductsIntoStage">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
+            <argument name="property" value="PageBuilderProductsProductGridAppearance"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy">
+            <argument name="property" value="PageBuilderProductsSelectProductsBySKU"/>
+        </actionGroup>
+        <actionGroup ref="addSKUsToSelectProductsBySKU" stepKey="addProductsSKUsToInputField">
+            <argument name="SKUs" value="$$createProduct1.sku$$"/>
+        </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterProductsCount">
+            <argument name="property" value="PageBuilderProductsCountPropertyFour"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
+        <actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage">
+            <argument name="page" value="ProductsOnStage"/>
+            <argument name="count" value="1"/>
+        </actionGroup>
+        <actionGroup ref="validateProductInProducts" stepKey="validateProduct1Stage">
+            <argument name="page" value="ProductsOnStage"/>
+            <argument name="product" value="ProductWithSpecialCharsInSKU"/>
+            <argument name="productIndex" value="1"/>
+        </actionGroup>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+        <reloadPage stepKey="reloadPage"/>
+        <waitForPageLoad stepKey="waitForReload"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
+        <actionGroup ref="validateProductCountInProducts" stepKey="validateProductsCountStage2">
+            <argument name="page" value="ProductsOnStage"/>
+            <argument name="count" value="1"/>
+        </actionGroup>
+        <actionGroup ref="validateProductInProducts" stepKey="validateProduct2Stage2">
+            <argument name="page" value="ProductsOnStage"/>
+            <argument name="product" value="ProductWithSpecialCharsInSKU"/>
+            <argument name="productIndex" value="1"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openProductsContentType">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="assertFieldSlideOutPropertyValueEquals" stepKey="assertSKUFilterValueEqualsToProductSKU">
+            <argument name="property" value="PageBuilderProductsEnterSKUsInput"/>
+            <argument name="value" value="$$createProduct1.sku$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml
index bdbdc435e61..1e3cc981be0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <after>
             <remove keyForRemoval="deleteCategory1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml
index 8f231e3937b..11fdfc07b8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyUpdatingPositionInCategoryUpdatesSortOrderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <!-- Change Product Position in Category -->
         <comment userInput="Change Product Position in Category" stepKey="commentChangeProductPositionInCategory" after="validateProduct2Storefront"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsVerifyProductItemsInteractionsOnStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsVerifyProductItemsInteractionsOnStorefrontTest.xml
index 61d22543d39..87307f38472 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsVerifyProductItemsInteractionsOnStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsVerifyProductItemsInteractionsOnStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsWithCountTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsWithCountTest.xml
index b945d7c57ed..429be77434e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsWithCountTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsWithCountTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml
index 1970772a3ab..565093eabb8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsGrid"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsUpdateAdvancedConfigurationValuesTest.xml
index e0888868e83..7a3b0baccd4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml
index a1f47b806e7..d6cfa9ab99b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/ProductsWrapsInsideTinyColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ProductsWrapsInsideTinyColumnTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlTest.xml
index 48b7147b40f..8e021d05009 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithImageTest.xml
index 85318aa3587..b66044b5f1e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml
index 063bded6425..b2de58612da 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,13 +22,20 @@
         </annotations>
         <before>
             <magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
         </before>
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
@@ -42,6 +49,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNonexistentDataRoleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNonexistentDataRoleTest.xml
index 7acec330107..54bbeff6bbd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNonexistentDataRoleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNonexistentDataRoleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadTextTest.xml
index ef7760ca943..370141ff400 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedInvalidVideoBackgroundNoFallbackImage.xml
index 3e3e1958473..038e1500419 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml
index 13686af907c..fb2e1b76983 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateParallaxVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateVideoBackground.xml
index 2558a7ab23f..561be2fb801 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index 37d60376511..ec94b9ed87b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundValidateFallbackImage.xml
index 09eae0a5f91..23a69d668b1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -43,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedInvalidVideoBackgroundNoFallbackImage.xml
index 96c39dcfd9d..7dd41c6d1b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml
index 3bb3dc6836f..5cb36ae9e44 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateParallaxVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateVideoBackground.xml
index 15ea1d60ddf..27aa492f289 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index a934e196601..120d83349e6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundValidateFallbackImage.xml
index 9e2d1549e7f..5c70df53a7d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullBleedVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthInvalidVideoBackgroundNoFallbackImage.xml
index ac9fad1894c..d157f1fc5cc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml
index cbfbeb69a5e..7cd6898a3cc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateParallaxVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateVideoBackground.xml
index ee6a85a5c9c..fe49bcf05b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index d48c1c8c9c5..c0a15490f07 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundValidateFallbackImage.xml
index 4c87f2f14b6..fa0de5267fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowFullWidthVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundFormTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundFormTest.xml
index af6a09de7db..bb5d74425ed 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundFormTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundFormTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowBackground"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToDesktopImageFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -41,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundSectionDefaultValuesTest.xml
index 820eab71ec5..f6e413e11d1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundSectionDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundSectionDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="RowValidateBackgroundSectionDefaultValuesTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowBackground"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundAspectRatio.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundAspectRatio.xml
index 80f94347a2a..2ca03530584 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundAspectRatio.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundAspectRatio.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopDisabled.xml
index a90f0efd6fa..93e1433bb02 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopEnabled.xml
index 951b9d61852..f99d24739f9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadDisabled.xml
index 5e7cc3cf7bd..cdc9bed6fec 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadEnabled.xml
index d6d1a41bca9..f21e6be684f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundLazyLoadEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -30,6 +30,7 @@
             <argument name="section" value="RowOnStage"/>
             <argument name="index" value="4"/>
         </actionGroup>
+        <comment userInput="Do not scroll to video row" stepKey="scrollToRow4Stage"/>
         <actionGroup ref="validateVideoBackgroundNotLoaded" stepKey="validateVideoNotPlayingStage1">
             <argument name="section" value="RowOnStage"/>
             <argument name="index" value="4"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
index 15c6fb83cc3..1aeb2450bb1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Set Large Min Height on Row 1 -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
index 8fae575667b..42b2a609b36 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -92,8 +92,14 @@
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
+        <actionGroup ref="ScrollToActionGroup" stepKey="scrollToRow4Stage">
+            <argument name="cssSelector" value="{{RowOnStage.affordanceCSS}}"/>
+            <argument name="index" value="4"/>
+            <argument name="verticalOffset" value="-100"/>
+        </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
         <!-- Stage: Validate Video is not Playing -->
-        <actionGroup ref="validateVideoBackgroundLoadedButNotPlaying" stepKey="validateVideoNotPlayingStage1">
+        <actionGroup ref="ValidateVideoBackgroundLoadedButNotPlayingAlternateActionGroup" stepKey="validateVideoNotPlayingStage1">
             <argument name="section" value="RowOnStage"/>
             <argument name="videoUrl" value="PageBuilderVideoBackgroundUrl_YouTube_NonEmbedded"/>
             <argument name="index" value="4"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml
index cfb8bdf6ea6..35af77cef5e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundSectionDefaultValues.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -87,10 +87,10 @@
         <actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundVideoURLs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundVideoURLs.xml
index 5428a4a155d..144139b0f39 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundVideoURLs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundVideoURLs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,11 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowBackground"/>
             <group value="pagebuilder-video-background"/>
+            <skip>
+                <issueId value="AC-12669"/>
+            </skip>
+
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowVerifyCanSwitchBackgroundTypes.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowVerifyCanSwitchBackgroundTypes.xml
index 7f9997bae22..8ee41cb958f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowVerifyCanSwitchBackgroundTypes.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowVerifyCanSwitchBackgroundTypes.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -55,6 +58,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Set Background Image Attributes -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContainedMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContainedMinHeightValidInputs.xml
index ea66399c2a1..c607611d977 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContainedMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContainedMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedTest.xml
index 35a23896f50..3aa71a2cbe4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-row-appearance"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedWithDifferentMinimumHeightsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedWithDifferentMinimumHeightsTest.xml
index 8291140c6f6..dcec7a39e80 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedWithDifferentMinimumHeightsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowContentIsVerticallyAlignedWithDifferentMinimumHeightsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-row-appearance"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullBleedMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullBleedMinHeightValidInputs.xml
index a9511be0ba1..50700dcd023 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullBleedMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullBleedMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullWidthMinHeightValidInputs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullWidthMinHeightValidInputs.xml
index 364d99fc9d9..6bf1d1575b9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullWidthMinHeightValidInputs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowFullWidthMinHeightValidInputs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowMinHeightInvalidInputsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowMinHeightInvalidInputsTest.xml
index 3c53d5c16a2..d6f66f7b470 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowMinHeightInvalidInputsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowMinHeightInvalidInputsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-row-appearance"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowValidateLayoutSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowValidateLayoutSectionDefaultValuesTest.xml
index 42a0c90182c..97fade49470 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowValidateLayoutSectionDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowValidateLayoutSectionDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-row-appearance"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersAndPaddingEqualToMinHeightTest.xml
index 8e3210ff112..7eb829787e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-row-appearance"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
index 02e74c8c1ea..7e8954e9a3f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowLayoutTest/RowWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-row-appearance"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowCanAddParallaxBackgroundTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowCanAddParallaxBackgroundTest.xml
index 87b8b2e696c..d7f1b8bcdb0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowCanAddParallaxBackgroundTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowCanAddParallaxBackgroundTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowParallax"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowHasParallaxDefaultSettingsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowHasParallaxDefaultSettingsTest.xml
index 80ee107a9a4..0d00662870c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowHasParallaxDefaultSettingsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowParallaxBackgroundAttributeTest/RowHasParallaxDefaultSettingsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowParallax"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowAboveInitialRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowAboveInitialRowTest.xml
index d8c89ffadf1..049bcacebdf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowAboveInitialRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowAboveInitialRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowBelowInitialRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowBelowInitialRowTest.xml
index 88d9c486b29..355da7fe9bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowBelowInitialRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAddAdditionalRowBelowInitialRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesFullWidthTextAlignmentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesFullWidthTextAlignmentTest.xml
index 26bca641444..55e3eb0b54c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesFullWidthTextAlignmentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesFullWidthTextAlignmentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesTest.xml
index cbc864c6c5e..ef35c338748 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowAppearances"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -34,7 +35,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesWarningMessageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesWarningMessageTest.xml
index 2467f2f397c..d10b9359682 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesWarningMessageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowAppearancesWarningMessageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowAppearances"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCanAddUnlimitedRowsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCanAddUnlimitedRowsTest.xml
index 86616b98ce8..ea36a2e6fd2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCanAddUnlimitedRowsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCanAddUnlimitedRowsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToColumnsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToColumnsTest.xml
index e971d8de8c3..da27b326ca5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToColumnsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToColumnsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="RowCannotAddToColumnsTest">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-addToColumn"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToRowTest.xml
index 10fb89e1c6d..2cf3069b961 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCannotAddToRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCantRemoveLastRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCantRemoveLastRowTest.xml
index c7688fe7ee0..6a252b142a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCantRemoveLastRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowCantRemoveLastRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml
index 214f1013acf..d54bd0d437a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -43,6 +47,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceNoErrorThrownTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceNoErrorThrownTest.xml
index 1691dc4aead..5bcb5626af9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceNoErrorThrownTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceNoErrorThrownTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pagebuilder-heading"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceWithInvalidLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceWithInvalidLayoutTest.xml
index 885a1b2d81e..d50757dde5c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceWithInvalidLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullBleedAppearanceWithInvalidLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowAppearances"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -34,6 +35,7 @@
             </actionGroup>
         </before>
         <after>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -73,7 +75,7 @@
         </actionGroup>
         <waitForElementVisible selector="{{RowOnStorefront.appearance(('1', PageBuilderRowAppearance_FullBleed.value)}}" stepKey="waitForAppearanceVisibleStorefront"/>
         <comment userInput="Increase window size" stepKey="commentResizeWindow"/>
-        <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
+        <resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
         <executeJS function="return {{PageBuilderStoreFront.pageWidthJS}}" stepKey="pageWidth"/>
         <executeJS function="return {{RowOnStorefront.rowWidthJS('1')}}" stepKey="rowWidth"/>
         <assertGreaterThan stepKey="assertRowWidthGreaterThanZero">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullWidthAppearanceWithInvalidLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullWidthAppearanceWithInvalidLayoutTest.xml
index b3aff54c34b..e5bd5ba2fd8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullWidthAppearanceWithInvalidLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowFullWidthAppearanceWithInvalidLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowAppearances"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -34,6 +35,7 @@
             </actionGroup>
         </before>
         <after>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage">
@@ -73,7 +75,7 @@
         </actionGroup>
         <waitForElementVisible selector="{{RowOnStorefront.appearance(('1', PageBuilderRowAppearance_FullWidth.value)}}" stepKey="waitForAppearanceVisibleStorefront1"/>
         <comment userInput="Increase window size" stepKey="commentResizeWindow"/>
-        <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
+        <resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
         <executeJS function="return {{PageBuilderStoreFront.pageWidthJS}}" stepKey="pageWidth"/>
         <executeJS function="return {{RowOnStorefront.rowWidthJS('1')}}" stepKey="rowWidth"/>
         <assertGreaterThan stepKey="assertRowWidthGreaterThanZero">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsLargerSliderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsLargerSliderTest.xml
index 3f90ec89b2a..95bdff86a82 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsLargerSliderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsLargerSliderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="RowHeightAdjustsToContentWhenContentIsLargerSliderTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pagebuilder-slide"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsSmallerHeadingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsSmallerHeadingTest.xml
index aa715586a82..ba7e179e205 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsSmallerHeadingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowHeightAdjustsToContentWhenContentIsSmallerHeadingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pagebuilder-heading"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowInitializeWithRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowInitializeWithRowTest.xml
index 36430316316..c5a1d037e2b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowInitializeWithRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowInitializeWithRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowMinimumHeightIsObeyedWhenParallaxIsEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowMinimumHeightIsObeyedWhenParallaxIsEnabledTest.xml
index 32c8a32f879..3d06069d558 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowMinimumHeightIsObeyedWhenParallaxIsEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowMinimumHeightIsObeyedWhenParallaxIsEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowParallax"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml
index 7bbd2de6c0d..c1aadad7184 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowNoRequiredAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -41,7 +42,7 @@
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundColor">
             <argument name="property" value="PageBuilderBackgroundColor_Default"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundImage">
+        <actionGroup ref="validateSlideOutPanelFieldIsNotRequiredWithUploaderIdActionGroup" stepKey="validateBackgroundImage">
             <argument name="property" value="PageBuilderBackgroundImage_Default"/>
         </actionGroup>
         <actionGroup ref="validateSlideOutPanelFieldIsNotRequired" stepKey="validateBackgroundPosition">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowPlaceholderAndDisplayLabelInAdminPreviewTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowPlaceholderAndDisplayLabelInAdminPreviewTest.xml
index 1a73d2dfab4..31e0e7683d0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowPlaceholderAndDisplayLabelInAdminPreviewTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowPlaceholderAndDisplayLabelInAdminPreviewTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="RowPlaceholderAndDisplayLabelInAdminPreviewTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-rowGeneral"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowRemoveRowFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowRemoveRowFromStageTest.xml
index 57c7a3c3d93..d09db9dd130 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowRemoveRowFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowRemoveRowFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowUpdateAdvancedConfigurationValuesTest.xml
index f7ea5d9ef44..e4e5353bc4a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml
index 1247a706cb0..f402e9899dd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="RowValidateAdvancedConfigurationDefaultValuesTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowGeneral"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateBorderOnAppearanceChangeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateBorderOnAppearanceChangeTest.xml
index 550d9e1843d..23a0b84d3ae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateBorderOnAppearanceChangeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowValidateBorderOnAppearanceChangeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-row"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowWithParallaxEnabledStillShowsBackgroundImageAfterAddingColumnToItTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowWithParallaxEnabledStillShowsBackgroundImageAfterAddingColumnToItTest.xml
index 8e301786a66..18519868922 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowWithParallaxEnabledStillShowsBackgroundImageAfterAddingColumnToItTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowWithParallaxEnabledStillShowsBackgroundImageAfterAddingColumnToItTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,9 +20,13 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-rowParallax"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateCannotMoveContentTypeIntoHiddenRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateCannotMoveContentTypeIntoHiddenRowTest.xml
index cbf9094b96c..d71f93593c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateCannotMoveContentTypeIntoHiddenRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateCannotMoveContentTypeIntoHiddenRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowDefaultStateTest.xml
index 273f869400f..38d59d301b8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-row"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowTest.xml
index 65878a51b8b..7f7a377d923 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/ValidateShowHideOnRowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenterOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenterOverlayPositionTest.xml
index 3220c469b30..f70a8030a17 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenterOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenterOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonNeverShowTest.xml
index 8ad531201b1..c10c9f47167 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonOnHoverTest.xml
index 36e35d01297..64a14e60089 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithMobileImageValuesTest.xml
index ead946593f7..202ec4a3c1f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithoutMobileImageValuesTest.xml
index e40ab0af2dc..ef3af6de857 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -38,6 +42,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayAndButtonOnHoverTest.xml
index b1ba65742d5..cd21083d92a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayNeverShowTest.xml
index 35352fdcd92..c9caff82a34 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayOnHoverTest.xml
index d22044be348..764a1ce93c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentTest.xml
index 1e8a02f9c6f..4e3dfea2556 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index f12426a0e61..124952eab6f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAdvancedConfigurationValuesTest.xml
index 63b96dcb3ee..671e74a43a3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAllAttributesTest.xml
index 210db397805..b63dc778a70 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterWYSIWYGDisabledInlineEditTest.xml
index ae79dd51fc4..89818be1c19 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideItemCollageCenterWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml
index d1bcc37406c..9176f0eae5a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageCenterAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterAlignmentInheritanceTest.xml
index bbc03bc2ba3..d36606d253c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterButtonsCanBeEditedInlineTest.xml
index 949e044b205..8217a63d30c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageCentered"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterHtmlValueInButtonsTest.xml
index 2efc61a75fb..2562e6e8906 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterInvalidVideoBackgroundNoFallbackImage.xml
index 09c010760db..915bc415994 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterNonBreakingSpaceValueInButtonsTest.xml
index c8a49a91d72..b10c5f2f52c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageCenter"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterValidateVideoBackground.xml
index 56e68331c09..7012fefb31f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index afac16f78ec..af22f746b5c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundValidateFallbackImage.xml
index fc27d659b90..2b4e04d7d68 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderCollageCenterVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderMinHeightWithCollageCenterSlideMinHeight.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderMinHeightWithCollageCenterSlideMinHeight.xml
index 8d0ec8fd8ac..41c09b2d821 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderMinHeightWithCollageCenterSlideMinHeight.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SliderMinHeightWithCollageCenterSlideMinHeight.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonNeverShowTest.xml
index 8910b342684..dc470b2fc70 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonOnHoverTest.xml
index 8ddac63ca26..29dde4282e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithMobileImageValuesTest.xml
index 83b0d863245..6380768f12b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithoutMobileImageValuesTest.xml
index d74f197af6d..9011ab4a181 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayAndButtonOnHoverTest.xml
index c01484fe7c3..45aa4f60b38 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayNeverShowTest.xml
index c89ed0797f6..6cf8ab6060b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayOnHoverTest.xml
index 941fadd9f6e..61637f5f17b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayPositionTest.xml
index da588961d6d..089a8aa7011 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideCollageLeftOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentTest.xml
index c3dad0d5780..b96201306fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index 350d460c1c4..b3f30de76be 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAdvancedConfigurationValuesTest.xml
index 40d2710c2ae..d6c7596c6e2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAllAttributesTest.xml
index a1f3f78cead..4d83ff338a9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWYSIWYGDisabledInlineEditTest.xml
index 60d61cfac0e..1ea0c421ac1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml
index 2a9195ab1ee..e888dc5c05a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideItemCollageLeftWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml
index 9e34eaa0d12..d7963386d3c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageLeftAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftAlignmentInheritanceTest.xml
index 3976d507bbf..d5435e0342c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftButtonsCanBeEditedInlineTest.xml
index e416ffcbddb..00e2f0e291b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftHtmlValueInButtonsTest.xml
index 3b17edfc8c4..71d9924d5e2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftInvalidVideoBackgroundNoFallbackImage.xml
index c0c18f5ed54..100211c8b30 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftNonBreakingSpaceValueInButtonsTest.xml
index 8a1bc7af891..e65a87a193e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageLeft"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageLeft"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftValidateVideoBackground.xml
index 3255e2ef6f0..44340c46299 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index 59264c02a52..92d23dd4b8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundValidateFallbackImage.xml
index 990aaaa3ec7..6adf145a7fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderCollageLeftVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderMinHeightWithCollageLeftSlideMinHeight.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderMinHeightWithCollageLeftSlideMinHeight.xml
index 6fce1e1ac19..0c36f35585a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderMinHeightWithCollageLeftSlideMinHeight.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageLeftTest/SliderMinHeightWithCollageLeftSlideMinHeight.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonNeverShowTest.xml
index 9f2354a55e0..be889b1cb7e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonOnHoverTest.xml
index cd26639b836..6fbcfa93af6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithMobileImageValuesTest.xml
index 13dce928ceb..145b42e7a9d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithoutMobileImageValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithoutMobileImageValuesTest.xml
index 5c4cbf20972..9ff8aa4f671 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithoutMobileImageValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightMobileWithoutMobileImageValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayAndButtonOnHoverTest.xml
index 01ee9d95238..220c938d90e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayNeverShowTest.xml
index fd7b05a845c..98e33d1e8ea 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayOnHoverTest.xml
index 5a9c9ed16a6..39202f88c14 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayPositionTest.xml
index bdf541e9448..eadd1cb1846 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideCollageRightOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentTest.xml
index 5cecdc36ca3..398e7a8b507 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index f4d7916b7e4..a703e328e4d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAdvancedConfigurationValuesTest.xml
index 2807717bba6..dbfcd41a48d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAllAttributesTest.xml
index 93d1f7cdd96..e1ca0ea170b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightWYSIWYGDisabledInlineEditTest.xml
index 99f4bf56a5d..8b1140493a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideItemCollageRightWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml
index 3aa71daa9f4..0e13072d935 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnCollageRightAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightAlignmentInheritanceTest.xml
index 5a661dcb790..eef642840ee 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightButtonsCanBeEditedInlineTest.xml
index e6c0790ed62..c7da83e21d6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearanceProperty">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightHtmlValueInButtonsTest.xml
index 601aa20e8ae..1d110220b7a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightInvalidVideoBackgroundNoFallbackImage.xml
index 8a7a9279be1..93815916f66 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightNonBreakingSpaceValueInButtonsTest.xml
index 5b9bcd98876..9db2956dec6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-sliderCollageRight"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderAppearance_CollageRight"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightValidateVideoBackground.xml
index 3c7d0d93160..eedead4873e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index c32db60c8fa..d8c0cde95c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundValidateFallbackImage.xml
index 7dca221a2af..746d9c32990 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderCollageRightVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderMinHeightWithCollageRightSlideMinHeight.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderMinHeightWithCollageRightSlideMinHeight.xml
index f8c1ef5d306..8cb4aa0ab4e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderMinHeightWithCollageRightSlideMinHeight.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageRightTest/SliderMinHeightWithCollageRightSlideMinHeight.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonNeverShowTest.xml
index 41a90676040..6cc8a98a611 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonOnHoverTest.xml
index f27d8da9d15..ef2689e250d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -84,7 +85,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" x="-1" y="0" stepKey="moveMouseAwayFromSlide"/>
         <!-- Validate Storefront Mobile -->
@@ -98,7 +102,10 @@
         </actionGroup>
         <seeElementInDOM selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefrontMobile"/>
         <dontSeeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefrontMobile"/>
-        <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" x="1" y="1" stepKey="moveMouseOverSlideStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
+        <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideStorefrontMobile"/>
+        <wait time="10" stepKey="pause1StorefrontMobile"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentTest.xml
index 95200052e9d..49f6e4f985c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,11 +19,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
index d202dd2c11a..10a460876af 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterCanInlineEditContentWhenIn25PercentWidthColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SlideItemPosterCanInlineEditContentWhenIn25PercentWidthColumnTest">
@@ -18,11 +18,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayAndButtonOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayAndButtonOnHoverTest.xml
index 5d4cdc6b1a6..d0c64c5e1c2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayAndButtonOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayAndButtonOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -111,7 +112,10 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Default.rgba}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefront"/>
         <waitForPageLoad time="30" stepKey="waitForSlideTransitionStorefront"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefront">
@@ -144,7 +148,10 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Default.rgba}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
-        <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" x="1" y="1" stepKey="moveMouseOverSlideStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutsideMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
+        <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideStorefrontMobile"/>
+        <wait time="10" stepKey="pause1StorefrontMobile"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverStorefrontMobile"/>
         <waitForPageLoad time="30" stepKey="waitForSlideTransitionStorefrontMobile"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefrontMobile">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayNeverShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayNeverShowTest.xml
index 4ed80e46047..9adea939669 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayNeverShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayNeverShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayOnHoverTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayOnHoverTest.xml
index 4e2f7df97cc..816de893e2b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayOnHoverTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayOnHoverTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -98,7 +99,10 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{SlideOnFrontend.base('1')}}" stepKey="moveMouseOverSlideStorefront"/>
+        <wait time="10" stepKey="pause1"/>
         <waitForPageLoad time="30" stepKey="waitForSlideTransitionStorefront"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverStorefront">
             <argument name="selector" value="{{SlideOnFrontend.overlay('1')}}"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayPositionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayPositionTest.xml
index 70b7be29998..cf2c17626c3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayPositionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterOverlayPositionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAdvancedConfigurationValuesTest.xml
index 6f75176d5c5..adbfcaba37b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAllAttributesTest.xml
index ab372af33cf..c6ff41df3b8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -44,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWYSIWYGDisabledInlineEditTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWYSIWYGDisabledInlineEditTest.xml
index c9636dce220..4bc8b471a8b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWYSIWYGDisabledInlineEditTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWYSIWYGDisabledInlineEditTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWithBordersAndPaddingEqualToMinHeightTest.xml
index c012c209b61..7c36dc973f9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
index f1144388635..c75be2c4e2d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SlideOverlayAndButtonDoNotGoOutsideContainerOnPosterAppearanceTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderItemPosterButtonsCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderItemPosterButtonsCanBeEditedInlineTest.xml
index b2b3ae6aa3a..3bc0abcc4b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderItemPosterButtonsCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderItemPosterButtonsCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterAlignmentInheritanceTest.xml
index 1875c457849..ceb91f872e7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterHtmlValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterHtmlValueInButtonsTest.xml
index 50f21938cf1..922c04920b7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterHtmlValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterHtmlValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderAppearance_Poster"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterInvalidVideoBackgroundNoFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterInvalidVideoBackgroundNoFallbackImage.xml
index e326ca9c16b..fbf47f8264f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterInvalidVideoBackgroundNoFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterInvalidVideoBackgroundNoFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterNonBreakingSpaceValueInButtonsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterNonBreakingSpaceValueInButtonsTest.xml
index 6eef661cd96..cab6e8b9565 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterNonBreakingSpaceValueInButtonsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterNonBreakingSpaceValueInButtonsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="chooseVisualSelectOption" stepKey="enterAppearance">
             <argument name="property" value="PageBuilderAppearance_Poster"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidatePaddingOnAppearanceChangeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidatePaddingOnAppearanceChangeTest.xml
index bb93b766f3a..4e799ae95cc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidatePaddingOnAppearanceChangeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidatePaddingOnAppearanceChangeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slider"/>
             <group value="pagebuilder-slideItemPoster"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidateVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidateVideoBackground.xml
index cdd10ac66e1..cf090c85d91 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidateVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidateVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider to Stage -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
index 7adf3414315..c9c418359e4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundNoFallbackImageDisabledLoopAndPlayWhenVisibleAndLazyLoad.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundValidateFallbackImage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundValidateFallbackImage.xml
index 7918ea61196..00c82dced1a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundValidateFallbackImage.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundValidateFallbackImage.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider to Stage -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideContentVariableCanWrapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideContentVariableCanWrapTest.xml
index a7a25e62607..039572f649c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideContentVariableCanWrapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideContentVariableCanWrapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SlideContentVariableCanWrapTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemAppearanceSectionDefaultsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemAppearanceSectionDefaultsTest.xml
index 159cacd9bfc..322f4b2dd45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemAppearanceSectionDefaultsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemAppearanceSectionDefaultsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundColorAlwaysDisplayedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundColorAlwaysDisplayedTest.xml
index 2e3a4d138f2..0871cff47ba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundColorAlwaysDisplayedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundColorAlwaysDisplayedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundImageInvalidFileTypeValidationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundImageInvalidFileTypeValidationTest.xml
index 7b801b22166..52f7f4f1630 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundImageInvalidFileTypeValidationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundImageInvalidFileTypeValidationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundSectionDefaultsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundSectionDefaultsTest.xml
index 773f415572c..47c58b7d558 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundSectionDefaultsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBackgroundSectionDefaultsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBorderIsVisibleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBorderIsVisibleTest.xml
index 738a032158d..882c0562acc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBorderIsVisibleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemBorderIsVisibleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotDeleteLastSlideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotDeleteLastSlideTest.xml
index 4fe9b39cb9c..976f1bfc1c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotDeleteLastSlideTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotDeleteLastSlideTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml
index 29106214a9d..42ad81af0b1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygLinkAndLinkUrlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
index f0531214384..c84d4adba25 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContainedVerifyCanSwitchBackgroundTypes.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContainedVerifyCanSwitchBackgroundTypes.xml
index a6373782f5d..aef96582c81 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContainedVerifyCanSwitchBackgroundTypes.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContainedVerifyCanSwitchBackgroundTypes.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -54,6 +57,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage2">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_SpecialCharacters"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider to Stage -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContentSectionDefaultsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContentSectionDefaultsTest.xml
index 2a264d93166..74388cb5b55 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContentSectionDefaultsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContentSectionDefaultsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteImageTest.xml
index 9e9853f0e32..9188d12a712 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,6 +33,9 @@
             </actionGroup>
         </before>
         <after>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteSlideItemTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteSlideItemTest.xml
index 2b26147b0f4..f13ddd1f140 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteSlideItemTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteSlideItemTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDoesNotNavigateInPreviewTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDoesNotNavigateInPreviewTest.xml
index 02e1cd64853..5d7acbbd124 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDoesNotNavigateInPreviewTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDoesNotNavigateInPreviewTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemEmptyLinkURLDoesNothingOnStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemEmptyLinkURLDoesNothingOnStorefrontTest.xml
index e745a38616a..481d98ac4cd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemEmptyLinkURLDoesNothingOnStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemEmptyLinkURLDoesNothingOnStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemHasEditButtonTextButtonStyledInAdminAndStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemHasEditButtonTextButtonStyledInAdminAndStorefrontTest.xml
index 5d9222d71a4..470cf85bc69 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemHasEditButtonTextButtonStyledInAdminAndStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemHasEditButtonTextButtonStyledInAdminAndStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml
index 42abc18dc04..4c90876c795 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemLinkURLFunctionsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemLinkURLFunctionsTest.xml
index 618c455f9b2..c5d43a24724 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemLinkURLFunctionsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemLinkURLFunctionsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml
index 0bf3b72ceda..b85d11d66fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemMoveSlideItemsToRearrangeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeDisabled.xml
index 2f90c5df186..d2070d7c920 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeEnabled.xml
index b272446fbd9..0a4d432ddba 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundLazyLoadEnabledWithSliderFadeEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeDisabled.xml
index 871e5e384f9..7c5a1bd26d5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeEnabled.xml
index 3ec51cc6c93..1e3c7f5cdfc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemNotActiveValidateVideoBackgroundPlayOnlyWhenVisibleEnabledWithSliderFadeEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemOverflowNotHiddenAfterDuplicatingParent.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemOverflowNotHiddenAfterDuplicatingParent.xml
index 4c8e4baa978..ce70d6da518 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemOverflowNotHiddenAfterDuplicatingParent.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemOverflowNotHiddenAfterDuplicatingParent.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SlideItemOverflowNotHiddenAfterDuplicatingParent">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTextContainingPageBuilderMarkupWontBreakStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTextContainingPageBuilderMarkupWontBreakStageTest.xml
index 54c3f5c199e..2a1f8c657dd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTextContainingPageBuilderMarkupWontBreakStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTextContainingPageBuilderMarkupWontBreakStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -40,5 +40,15 @@
         <dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCode"/>
         <waitForElementVisible selector="{{SlideOnBackend.base('1')}}" stepKey="waitForSlideItemVisible"/>
         <seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemButtonText_Common.value)}}" stepKey="seeTestStringInSlideItem"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenDesktop"/>
+        <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageDesktop"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCodeAfterSave"/>
+        <waitForElementVisible selector="{{SlideOnBackend.base('1')}}" stepKey="waitForSlideItemVisibleAfterSave"/>
+        <seeElement selector="{{SlideOnBackend.messageContent('1', PageBuilderSlideItemButtonText_Common.value)}}" stepKey="seeTestStringInSlideItemAfterSave"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTinyMCEMenuOpensInFrontOfVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTinyMCEMenuOpensInFrontOfVideoBackground.xml
index 6c29feefef8..4444504a7f9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTinyMCEMenuOpensInFrontOfVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemTinyMCEMenuOpensInFrontOfVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SlideItemTinyMCEMenuOpensInFrontOfVideoBackground">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemUploadImageFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemUploadImageFromStageTest.xml
index dc900d5e07b..98a953bc865 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemUploadImageFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemUploadImageFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
@@ -41,6 +44,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
@@ -57,7 +63,7 @@
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
+        <attachFile selector="{{PageBuilderStage.uploadImageInputWithUploaderId('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
             <argument name="section" value="SlideOnBackend"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateAdvancedConfigurationDefaultValuesTest.xml
index 897c2f07d2b..fba8558b774 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateSlideCannotBeHiddenTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateSlideCannotBeHiddenTest.xml
index 899b6ff64fc..2a6aaea196c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateSlideCannotBeHiddenTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateSlideCannotBeHiddenTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundAspectRatio.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundAspectRatio.xml
index 170cc7e478e..737cb438dff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundAspectRatio.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundAspectRatio.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopDisabled.xml
index 71add203f49..b8822084433 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopEnabled.xml
index 9d5a374fbf2..fc9efad52be 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider to Stage -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadDisabled.xml
index ac9c701f024..8de7bdcb419 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadEnabled.xml
index 60b42fd109c..7fac623f9ed 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundLazyLoadEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
index 9a27a7faa6e..32532e8050e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Set Large Min Height on Row 1 -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
index c0c3ce6da4f..964615b1cfa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundSectionDefaultValues.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundSectionDefaultValues.xml
index 30550e84525..746a600f9a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundSectionDefaultValues.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundSectionDefaultValues.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -93,10 +93,10 @@
         <actionGroup ref="seeNoImageUploadedOnSlideOut" stepKey="validateNoFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldTooltip" stepKey="validateTooltipFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldTooltipWithUploaderId" stepKey="validateTooltipFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
-        <actionGroup ref="validateSlideOutPanelFieldHelperText" stepKey="validateHelperTextFallbackImage">
+        <actionGroup ref="validateSlideOutPanelFieldHelperTextWithUploaderId" stepKey="validateHelperTextFallbackImage">
             <argument name="property" value="PageBuilderVideoBackgroundFallbackImage_Empty"/>
         </actionGroup>
     </test>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundVideoURLs.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundVideoURLs.xml
index 6161e64cd04..c0f9075a0cf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundVideoURLs.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundVideoURLs.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,10 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pagebuilder-video-background"/>
+            <skip>
+                <issueId value="AC-12669"/>
+            </skip>
+            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyEmptySlideDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyEmptySlideDefaultStateTest.xml
index 23dd7d0ea7c..f6f825c5923 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyEmptySlideDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyEmptySlideDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,7 +32,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsForEachAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsForEachAppearanceTest.xml
index 5a4fdd8faa3..f99eb9c10b3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsForEachAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsForEachAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
@@ -34,6 +37,9 @@
         </before>
         <after>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsWorkWithVideoBackground.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsWorkWithVideoBackground.xml
index 94931d8d757..d6270d885f1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsWorkWithVideoBackground.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsWorkWithVideoBackground.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteBackgroundImage1">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemWithDefaultMinHeightAdjustsToContentHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemWithDefaultMinHeightAdjustsToContentHeightTest.xml
index 7f300766dd3..dc1b49b38cb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemWithDefaultMinHeightAdjustsToContentHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemWithDefaultMinHeightAdjustsToContentHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideNameDoesNotRenderHtmlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideNameDoesNotRenderHtmlTest.xml
index 6ef8c88a361..a6d796b1536 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideNameDoesNotRenderHtmlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideNameDoesNotRenderHtmlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-slideItemCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideUploadImageWithSecretKeyEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideUploadImageWithSecretKeyEnabledTest.xml
index 767e1ace434..50e610c5771 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideUploadImageWithSecretKeyEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideUploadImageWithSecretKeyEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SlideInlineWYSIWYGWidgetAndVariableStyleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SlideInlineWYSIWYGWidgetAndVariableStyleTest.xml
index 30c365d6234..0ffba5e49fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SlideInlineWYSIWYGWidgetAndVariableStyleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SlideInlineWYSIWYGWidgetAndVariableStyleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAddToColumnTest.xml
index 6923ef49bc6..d7838ddf786 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SliderAddToColumnTest">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAllAttributesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAllAttributesTest.xml
index a091667715d..7e30ebd68f5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAllAttributesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderAllAttributesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeDeletedAfterAccidentalDragTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeDeletedAfterAccidentalDragTest.xml
index ddfb0980527..737ed0831a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeDeletedAfterAccidentalDragTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeDeletedAfterAccidentalDragTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeNavigatedQuicklyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeNavigatedQuicklyTest.xml
index 84772ec5fc1..3e1581f0e83 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeNavigatedQuicklyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanBeNavigatedQuicklyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanHaveContentPlacedAboveTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanHaveContentPlacedAboveTest.xml
index 1f9c34b6770..ebe67eee825 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanHaveContentPlacedAboveTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanHaveContentPlacedAboveTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanManageSlidesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanManageSlidesTest.xml
index a664647e317..11986367319 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanManageSlidesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCanManageSlidesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotAddToStageTest.xml
index 59396778c27..ccbb3f92412 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-sliderCommon"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotHaveContentDroppedInsideTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotHaveContentDroppedInsideTest.xml
index a99104d1cd5..0ce40151c5d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotHaveContentDroppedInsideTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderCannotHaveContentDroppedInsideTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDeleteTest.xml
index 9ffde2c3e86..56badf48ce2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDuplicateTest.xml
index c02406e55b1..432e814b366 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderFadeCanBeInlineEditedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderFadeCanBeInlineEditedTest.xml
index ee0a4c79aab..e121b32ca35 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderFadeCanBeInlineEditedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderFadeCanBeInlineEditedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMinHeightWithPosterSlideMinHeight.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMinHeightWithPosterSlideMinHeight.xml
index d722d5035db..f558350509f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMinHeightWithPosterSlideMinHeight.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMinHeightWithPosterSlideMinHeight.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMoveSliderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMoveSliderTest.xml
index a58a1f265ae..92385cc3402 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMoveSliderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderMoveSliderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SliderMoveSliderTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderSettingsSectionDefaultsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderSettingsSectionDefaultsTest.xml
index b6ff5eed7ff..39228cec5dc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderSettingsSectionDefaultsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderSettingsSectionDefaultsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderUpdateAdvancedConfigurationValuesTest.xml
index fc7a1afd833..46d67f13a66 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateAdvancedConfigurationDefaultValuesTest.xml
index c5b5244442a..d1f6d395c07 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopDisabled.xml
index b3a9a81abc0..bfdf2d6f47b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SliderValidateInfiniteLoopDisabled" extends="SliderValidateInfiniteLoopEnabled">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopEnabled.xml
index e48c1e7a71b..4e65b98f1ff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateInfiniteLoopEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="SliderValidateInfiniteLoopEnabled">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderDefaultStateTest.xml
index bac7da66fff..498a41a0b1e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderTest.xml
index 8e76c2c8cc5..fcb5f1bfdeb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderValidateShowHideOnSliderTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithBordersAndPaddingEqualToMinHeightTest.xml
index 05b5b918ef7..048abc0c11a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithNoDotsEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithNoDotsEqualToMinHeightTest.xml
index db086a2721a..285db3b790d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithNoDotsEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSliderCommonTests/SliderWithNoDotsEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-slide"/>
             <group value="pagebuilder-sliderCommon"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsAdvancedSettingsApplyInAdminPreviewAndStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsAdvancedSettingsApplyInAdminPreviewAndStorefrontTest.xml
index 382df17ebe7..f6982e74322 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsAdvancedSettingsApplyInAdminPreviewAndStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsAdvancedSettingsApplyInAdminPreviewAndStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsCanAddToColumnTest.xml
index 03aaa182018..b1ea3cefe07 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsCanAddToColumnTest">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDefaultActiveTabToSecondTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDefaultActiveTabToSecondTabTest.xml
index e521aa0e2c8..cf72e6efe66 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDefaultActiveTabToSecondTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDefaultActiveTabToSecondTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateDefaultEmptyStateTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateDefaultEmptyStateTabTest.xml
index a0d8d119196..fe49b69f0ed 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateDefaultEmptyStateTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateDefaultEmptyStateTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabContentTest.xml
index e07beb3a1e6..108a1d6f2ae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabSettingsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabSettingsTest.xml
index 7807ca58a94..f16a9cf8819 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabSettingsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTabWithCustomizedTabSettingsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTest.xml
index d135abbbca7..16f41ba418d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMinHeightAppliesInAdminPreviewAndStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMinHeightAppliesInAdminPreviewAndStorefrontTest.xml
index 56e01b713aa..a56c44b627a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMinHeightAppliesInAdminPreviewAndStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMinHeightAppliesInAdminPreviewAndStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMovesTabsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMovesTabsTest.xml
index 66b2edd04ff..e2f2c14343b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMovesTabsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsMovesTabsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsMovesTabsTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tab"/>
             <group value="pagebuilder-tabGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignCenterAppliesInAdminPreviewAndStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignCenterAppliesInAdminPreviewAndStorefrontTest.xml
index 6f7e5524bb9..32b08999437 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignCenterAppliesInAdminPreviewAndStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignCenterAppliesInAdminPreviewAndStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignRightAppliesInAdminPreviewAndStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignRightAppliesInAdminPreviewAndStorefrontTest.xml
index 33aa806f5e6..5b9cb37e6b5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignRightAppliesInAdminPreviewAndStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsNavAlignRightAppliesInAdminPreviewAndStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRearrangeTabItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRearrangeTabItemsTest.xml
index e9986a50ea7..9ca00b71638 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRearrangeTabItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRearrangeTabItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-move"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRendersAndIsInteractiveAfterDroppingSomeColumnsAboveTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRendersAndIsInteractiveAfterDroppingSomeColumnsAboveTest.xml
index ec2bd9ee8f7..1339e865c15 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRendersAndIsInteractiveAfterDroppingSomeColumnsAboveTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsRendersAndIsInteractiveAfterDroppingSomeColumnsAboveTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsRendersAndIsInteractiveAfterDroppingSomeColumnsAboveTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-tab"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsValidateAdvancedConfigurationDefaultValuesTest.xml
index fb84345d4d4..e32c9826560 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabsValidateAdvancedConfigurationDefaultValuesTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabGroup"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsWithBordersAndPaddingEqualToMinHeightTest.xml
index 667432f6534..6c2279f5159 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/TabsWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsGroup"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateCannotMoveContentTypeIntoHiddenTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateCannotMoveContentTypeIntoHiddenTabTest.xml
index 132e22ded0f..7162ac6cdaa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateCannotMoveContentTypeIntoHiddenTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateCannotMoveContentTypeIntoHiddenTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,7 @@
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabChildDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabChildDefaultStateTest.xml
index 70ded9c62ac..a1285da31e8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabChildDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabChildDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tab"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsDefaultStateTest.xml
index 4ff6e092814..24c74f10237 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsTest.xml
index c37a3294f62..02bf17931b8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateShowHideOnTabsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabChildHideShowTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabChildHideShowTest.xml
index ab24c1faadb..b49ae2ed434 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabChildHideShowTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabChildHideShowTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-tab"/>
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabItemNotHideableTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabItemNotHideableTest.xml
index e0a168430db..16d3220f893 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabItemNotHideableTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabGroupTest/ValidateTabItemNotHideableTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-tabGroup"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundFormTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundFormTest.xml
index 26fb6dcdc73..febc1c3f6e0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundFormTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundFormTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsBackground-update"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -30,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToDesktopImageFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>
@@ -41,6 +45,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundSectionDefaultValuesTest.xml
index 7261eeb2501..5df09f46c5b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundSectionDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundSectionDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsBackground"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -31,7 +32,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundColorAndMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundColorAndMinHeightTest.xml
index cf6f8e66330..c592b9f5bd0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundColorAndMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundColorAndMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2918"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifBottomAutoContainScrollFixedYesBackgroundRepeatAfterSaveTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifBottomAutoContainScrollFixedYesBackgroundRepeatAfterSaveTest.xml
index 14ce3c9afe5..c46d3c6e486 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifBottomAutoContainScrollFixedYesBackgroundRepeatAfterSaveTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifBottomAutoContainScrollFixedYesBackgroundRepeatAfterSaveTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,8 +18,12 @@
             <testCaseId value="MC-4048"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifCenterAutoContainFixedNoBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifCenterAutoContainFixedNoBackgroundRepeatTest.xml
index ad1fb4f5295..7eb0827b8a9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifCenterAutoContainFixedNoBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifCenterAutoContainFixedNoBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4049"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgBottomCoverScrollFixedNoBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgBottomCoverScrollFixedNoBackgroundRepeatTest.xml
index 67578a7c483..57f5c66a980 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgBottomCoverScrollFixedNoBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgBottomCoverScrollFixedNoBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4047"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage3"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterAutoContainScrollFixedNoBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterAutoContainScrollFixedNoBackgroundRepeatTest.xml
index 520bf6660f6..6fbf7b1a6c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterAutoContainScrollFixedNoBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterAutoContainScrollFixedNoBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4045"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage3"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedNoBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedNoBackgroundRepeatTest.xml
index 4c8524d42e5..02a4268762c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedNoBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedNoBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4046"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage3"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedYesBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedYesBackgroundRepeatTest.xml
index 2fee8cff9a1..e58f2f471b4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedYesBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedYesBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4044"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage3"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedNoBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedNoBackgroundRepeatTest.xml
index c8309e2b975..aa2f225edbd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedNoBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedNoBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4042"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedYesBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedYesBackgroundRepeatTest.xml
index d63b6d5dfdd..c6793a75745 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedYesBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedYesBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4043"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage3"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngBottomAutoContainScrollNoBackgroundRepeatAfterSaveTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngBottomAutoContainScrollNoBackgroundRepeatAfterSaveTest.xml
index 0c7063eccc0..8637f6196db 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngBottomAutoContainScrollNoBackgroundRepeatAfterSaveTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngBottomAutoContainScrollNoBackgroundRepeatAfterSaveTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4050"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <closeTab stepKey="closeTab"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngTopAutoContainScrollFixedYesBackgroundRepeatTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngTopAutoContainScrollFixedYesBackgroundRepeatTest.xml
index 3d1cf1fcc80..24181e52ed1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngTopAutoContainScrollFixedYesBackgroundRepeatTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngTopAutoContainScrollFixedYesBackgroundRepeatTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,9 +18,13 @@
             <testCaseId value="MC-4051"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -42,6 +46,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderBackgroundImage_PNG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml
index 964a1a5fd1d..e4d8da2ef7d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/DefaultTabItemStateOnAddingNewTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="DefaultTabItemStateOnAddingNewTabTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -146,7 +147,7 @@
         </actionGroup>
         <!-- Background Position has expected dropdown values -->
         <comment userInput="Background Position has expected dropdown values" stepKey="commentDefaultBackgroundPositionValues"/>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundPositionOptions"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundPosition_Default.section, PageBuilderBackgroundPosition_Default.fieldName)}}" userInput="data-title" stepKey="grabBackgroundPositionOptions"/>
         <assertEquals message="Verify Background Position dropdown options" stepKey="assertBackgroundPositionOptions">
             <actualResult type="variable">grabBackgroundPositionOptions</actualResult>
             <expectedResult type="array">{{PageBuilderBackgroundPosition_Default.optionsList}}</expectedResult>
@@ -166,7 +167,7 @@
         <actionGroup ref="seeOptionIsSelectedSlideOutProperty" stepKey="validateBackgroundAttachment">
             <argument name="property" value="PageBuilderBackgroundAttachment_Scroll"/>
         </actionGroup>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundAttachment_Default.section, PageBuilderBackgroundAttachment_Default.fieldName)}}" userInput="innerText" stepKey="grabBackgroundAttachmentOptions"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderBackgroundAttachment_Default.section, PageBuilderBackgroundAttachment_Default.fieldName)}}" userInput="data-title" stepKey="grabBackgroundAttachmentOptions"/>
         <assertEquals message="Verify Background Attachment dropdown options" stepKey="assertBackgroundAttachmentOptions">
             <actualResult type="variable">grabBackgroundAttachmentOptions</actualResult>
             <expectedResult type="array">{{PageBuilderBackgroundAttachment_Default.optionsList}}</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/EditTabNameByClickingOnHeaderInStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/EditTabNameByClickingOnHeaderInStageTest.xml
index b85f324ebd5..48af1d6c656 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/EditTabNameByClickingOnHeaderInStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/EditTabNameByClickingOnHeaderInStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2612"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabHeaderNonBreakingSpaceValueInStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabHeaderNonBreakingSpaceValueInStageTest.xml
index e2b279a8660..aa055fd06ca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabHeaderNonBreakingSpaceValueInStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabHeaderNonBreakingSpaceValueInStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemUpdateAdvancedConfigurationValuesTest.xml
index 8c69cbbad57..6c0643da094 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-4041"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemValidateAdvancedConfigurationDefaultValuesTest.xml
index 0ebfd951a4c..836869db912 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/TabItemValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabItemValidateAdvancedConfigurationDefaultValuesTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -73,7 +74,7 @@
             <argument name="property" value="PageBuilderAdvancedBorderPropertyDefault"/>
         </actionGroup>
         <comment userInput="Border: available values None, Default, Dotted, Dashed, Solid, Double, Groove, Ridge, Inset, Outset" stepKey="AC2"/>
-        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="innerText" stepKey="grabBorderOptions"/>
+        <grabMultiple selector="{{EditPanelForm.panelFieldOptions(PageBuilderAdvancedBorderPropertyDefault.section, PageBuilderAdvancedBorderPropertyDefault.fieldName)}}" userInput="data-title" stepKey="grabBorderOptions"/>
         <assertEquals message="Verify Border dropdown options" stepKey="assertBorderOptions2">
             <actualResult type="variable">grabBorderOptions</actualResult>
             <expectedResult type="array">{{PageBuilderAdvancedBorderDefaultSlideProperty.optionsList}}</expectedResult>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddBannerToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddBannerToTabTest.xml
index 89d2f5f5f0b..1e35ee0376f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddBannerToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddBannerToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2720"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddButtonToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddButtonToTabTest.xml
index 56f18ee9dac..c20e898d0fe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddButtonToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddButtonToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddColumnToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddColumnToTabTest.xml
index b50dbcad323..e5cf1175540 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddColumnToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddColumnToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CanAddColumnToTabTest">
@@ -17,6 +17,7 @@
             <testCaseId value="MC-2670"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddContentTypeToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddContentTypeToTabTest.xml
index 1e4963005d3..34a60d1cbec 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddContentTypeToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddContentTypeToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddDividerToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddDividerToTabTest.xml
index b4095204f7d..1fd1771aa28 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddDividerToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddDividerToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHeadingToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHeadingToTabTest.xml
index a59797a0149..a220c70532e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHeadingToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHeadingToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs-content"/>
             <group value="pagebuilder-heading"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHtmlToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHtmlToTabTest.xml
index 862889870dc..4ee1c13dba9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHtmlToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddHtmlToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddImageToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddImageToTabTest.xml
index be1c2c74f6c..02ca646dcae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddImageToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddImageToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,9 +19,13 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pagebuilder-image"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
             <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
@@ -37,6 +41,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -68,7 +75,7 @@
         <seeElement selector="{{ImageOnStageWithoutImageUploaded.uploadImageBtn}}" stepKey="seeUploadImageBtn"/>
         <seeElement selector="{{ImageOnStageWithoutImageUploaded.selectFromGalleryBtn}}" stepKey="seeSelectFromGalleryBtn"/>
         <!-- Attach image A to PageBuilder stage-->
-        <attachFile userInput="{{PageBuilderImageProperty_StageJPG.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtn}}" stepKey="attachImageFileOnStage"/>
+        <attachFile userInput="{{PageBuilderImageProperty_StageJPG.value}}" selector="{{ImageOnStageWithoutImageUploaded.attachImageBtnWithUploaderId}}" stepKey="attachImageFileOnStage"/>
         <waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imagePreview}}" stepKey="waitForImagePreview"/>
         <waitForElementVisible selector="{{ImageOnStageWithoutImageUploaded.imageSource('magentoStage')}}" stepKey="waitForImageSource"/>
         <seeElement selector="{{ImageOnStageWithoutImageUploaded.imageSource('magentoStage')}}" stepKey="seeImageSourceOnStage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddMapToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddMapToTabTest.xml
index a8d5ad3883a..21b4947449c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddMapToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddMapToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs-content"/>
             <group value="pagebuilder-map"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddProductsToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddProductsToTabTest.xml
index e246cd660d0..9f89a226c45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddProductsToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddProductsToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToSecondaryTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToSecondaryTabTest.xml
index 879c2ace96f..e72b2a2827d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToSecondaryTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToSecondaryTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pagebuilder-slide"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToTabTest.xml
index 8ad0ee6cbdc..e337110dda1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddSliderToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pagebuilder-slide"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddTextToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddTextToTabTest.xml
index 20f0c534c8e..1a471159ae7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddTextToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddTextToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddVideoToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddVideoToTabTest.xml
index e204c077468..83cb5089b8c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddVideoToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddVideoToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-video"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddColumnToTabInsideColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddColumnToTabInsideColumnTest.xml
index 25564de7663..f6e7c7238a1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddColumnToTabInsideColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddColumnToTabInsideColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CannotAddColumnToTabInsideColumnTest">
@@ -19,6 +19,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddRowToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddRowToTabTest.xml
index 17f711e22a9..ba45115b547 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddRowToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddRowToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddTabsToTabTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddTabsToTabTest.xml
index 9ea606fb9ec..26370d039bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddTabsToTabTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CannotAddTabsToTabTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/TabMaintainsDefaultMinimumHeightWithContentTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/TabMaintainsDefaultMinimumHeightWithContentTest.xml
index 37a02f4de9b..d0aa9cfc1b3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/TabMaintainsDefaultMinimumHeightWithContentTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/TabMaintainsDefaultMinimumHeightWithContentTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TabMaintainsDefaultMinimumHeightWithContentTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs-content"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsDismissedCustomizedTabRemovalConfirmationPersistsSessionTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsDismissedCustomizedTabRemovalConfirmationPersistsSessionTest.xml
index dd5624d3afe..440b2deaaff 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsDismissedCustomizedTabRemovalConfirmationPersistsSessionTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsDismissedCustomizedTabRemovalConfirmationPersistsSessionTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsOnDeleteCorrectTabBecomesActiveAndFocusedTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsOnDeleteCorrectTabBecomesActiveAndFocusedTest.xml
index 83528e27cc7..da8ab895d5e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsOnDeleteCorrectTabBecomesActiveAndFocusedTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsOnDeleteCorrectTabBecomesActiveAndFocusedTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredSecondTabWithConfirmationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredSecondTabWithConfirmationTest.xml
index f1ae7b54e66..bd133ed9cc2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredSecondTabWithConfirmationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredSecondTabWithConfirmationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredTabsContainerWithConfirmationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredTabsContainerWithConfirmationTest.xml
index 5fe3143455b..8330c59ac23 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredTabsContainerWithConfirmationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveConfiguredTabsContainerWithConfirmationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveLastTabByDeletingTabsContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveLastTabByDeletingTabsContentTypeTest.xml
index 0c6ce0d6200..afcdc9bb8d9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveLastTabByDeletingTabsContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveLastTabByDeletingTabsContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabContainingTextWithConfirmationTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabContainingTextWithConfirmationTest.xml
index a52b1a4dfb0..225b7741273 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabContainingTextWithConfirmationTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabContainingTextWithConfirmationTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabDefaultStateTest.xml
index 2d1dafb7c8e..30c5b81c1bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemDeleteTest/TabsRemoveSecondTabDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsDelete"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomTest.xml
index 29cda6f0ef4..ff5b6e2c0c1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomWithMinimumHeightsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomWithMinimumHeightsTest.xml
index a083c577058..ebd5d114d8c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomWithMinimumHeightsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedBottomWithMinimumHeightsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterTest.xml
index 847f61f002f..cb06914c120 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterWithMinimumHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterWithMinimumHeightTest.xml
index 306104fdaf7..8067e564c45 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterWithMinimumHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedCenterWithMinimumHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopTest.xml
index fe7f5ad00dc..8080f6b6827 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopWithMinimumHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopWithMinimumHeightTest.xml
index b2b26eeb5cc..ea834b02cf1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopWithMinimumHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabContentIsVerticallyAlignedTopWithMinimumHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemMinHeightInvalidInputsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemMinHeightInvalidInputsTest.xml
index 36cb8047261..563d361cd25 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemMinHeightInvalidInputsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemMinHeightInvalidInputsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemValidateLayoutSectionDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemValidateLayoutSectionDefaultValuesTest.xml
index 31c37e4ad74..060c253ebc9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemValidateLayoutSectionDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemValidateLayoutSectionDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersAndPaddingEqualToMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersAndPaddingEqualToMinHeightTest.xml
index 425424dc24e..c7bff930fa8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersAndPaddingEqualToMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersAndPaddingEqualToMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderTabsContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
index 69131c76875..821672dcaae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemLayoutTest/TabItemWithBordersPaddingAndLargeContentsGreaterThanMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-tabs"/>
             <group value="pagebuilder-tabsLayout"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateGridFunctionality.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateGridFunctionality.xml
index 9b5edda55a2..f17811f2ebf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateGridFunctionality.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateGridFunctionality.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateMultipleTimes.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateMultipleTimes.xml
index 5cc21c2d75d..53c034e2e15 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateMultipleTimes.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplateMultipleTimes.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml
index 009ba0b1904..6df85087f4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderApplyTemplatesPermission.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateAndValidateTemplateGridData.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateAndValidateTemplateGridData.xml
index 242e4a56acc..7e43afb3525 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateAndValidateTemplateGridData.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateAndValidateTemplateGridData.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
index 0ffe6ef9df4..17f9a24ed0e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateWithSecretKeyEnabledTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateWithSecretKeyEnabledTest.xml
index 509c4fd2936..642dace3634 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateWithSecretKeyEnabledTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderCreateTemplateWithSecretKeyEnabledTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplate.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplate.xml
index 16d41de5fa3..4e30aecda2a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplate.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplate.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml
index ec5a98b90f3..d5472dfbf32 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderDeleteTemplatesPermission.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderMustSavePageForApplyTemplateToSave.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderMustSavePageForApplyTemplateToSave.xml
index f21b3b050d0..a3f73b856e5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderMustSavePageForApplyTemplateToSave.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderMustSavePageForApplyTemplateToSave.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml
index f3c6ec1849a..59fa9306d63 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderSaveTemplatesPermission.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplateGridPageGridFunctionality.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplateGridPageGridFunctionality.xml
index cb096eae64d..ff583a25e65 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplateGridPageGridFunctionality.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplateGridPageGridFunctionality.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesDisablePageBuilder.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesDisablePageBuilder.xml
index e97f17b2e90..7cf721c80a1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesDisablePageBuilder.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesDisablePageBuilder.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml
index 9cb9eea5d75..ab48b2ba83c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderTemplatesPermission.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-templates"/>
             <group value="pagebuilder-templates-permissions"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="rolePageBuilderTemplates" stepKey="role1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
index 894e75cd75b..2af10a10ce3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/AdminSaveCmsPageAfterCopyFromHeadingAndPasteToTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/AdminSaveCmsPageAfterCopyFromHeadingAndPasteToTextTest.xml
index a6b382177fa..0f3a1c849e7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/AdminSaveCmsPageAfterCopyFromHeadingAndPasteToTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/AdminSaveCmsPageAfterCopyFromHeadingAndPasteToTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-heading"/>
             <group value="pagebuilder-text"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <createData entity="_emptyCmsPage" stepKey="createCmsPage"/>
@@ -71,5 +72,8 @@
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStageAfterSave"/>
         <waitForElementVisible selector="{{HeadingOnStage.headingText(PageBuilderHeadingTypeProperty_H2.value, PageBuilderHeadingTextProperty.value, '1')}}" stepKey="waitForHeadingVisible"/>
         <waitForElementVisible selector="{{TextOnStage.text('1', PageBuilderHeadingTextProperty.value)}}" stepKey="waitForTextVisible"/>
+        <!-- Verify page builder text element's content (pasted from the heading element) styling is not removed -->
+        <seeElement selector="{{TextOnStage.elementInText('1', PageBuilderHeadingTypeProperty_H2.value, '1')}}" stepKey="seeTextElementContainsH2Tag"/>
+        <seeElement selector="{{TextOnStage.textWithTag('1', PageBuilderHeadingTypeProperty_H2.value, PageBuilderHeadingTextProperty.value)}}" stepKey="seeCopiedTextInTextElement"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddLinkToTextInlineWYSIWYGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddLinkToTextInlineWYSIWYGTest.xml
index a53d720637b..2b5b79f449d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddLinkToTextInlineWYSIWYGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddLinkToTextInlineWYSIWYGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml
index b0823f5aa6d..454fd0c76c7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithCustomTinyMCETest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextAddTextWithCustomTinyMCETest">
@@ -18,7 +19,6 @@
             <testCaseId value="MC-1333"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
@@ -54,7 +54,7 @@
         <seeElement selector="{{WYSIWYGOnPageBuilder.backgroundColor}}" stepKey="seeBackgroundColor"/>
 
         <!--Verify FontStyle on preview-->
-        <executeJS function="tinyMCE.get('pagebuilder_text_form_content').setContent('{{PageBuilderTextContentTypeDefault.value}}');" stepKey="executeJSFillContent"/>
+        <executeJS function="hugerte.get('pagebuilder_text_form_content').setContent('{{PageBuilderTextContentTypeDefault.value}}');" stepKey="executeJSFillContent"/>
         <click selector="{{WYSIWYGOnPageBuilder.formatSelector}}" stepKey="expandFormatList"/>
         <see userInput="Headings" stepKey="seeHeadingsStyle"/>
         <click selector="{{TextOnStage.headingsList}}" stepKey="selectHeadingsList"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithTinyMCETest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithTinyMCETest.xml
index 42c48a14e8a..30feaccf74a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithTinyMCETest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddTextWithTinyMCETest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddVariableWithinStringInlineWYSWIYGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddVariableWithinStringInlineWYSWIYGTest.xml
index 4e0a26247b7..9f66bc37570 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddVariableWithinStringInlineWYSWIYGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddVariableWithinStringInlineWYSWIYGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml
index 0899ce190ff..8e298b84203 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextAddWYSIWYGContentTypeToColumnOnStageTextTest">
@@ -23,7 +23,13 @@
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPageB"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCaches">
+                <argument name="tags" value="config" />
+            </actionGroup>
         </before>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -40,6 +46,12 @@
             </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCaches">
+                <argument name="tags" value="config" />
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml
index 3e7d934a37e..c8b3d3201a9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPageB"/>
@@ -41,6 +44,9 @@
             </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWidgetWithinStringInlineWYSIWYGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWidgetWithinStringInlineWYSIWYGTest.xml
index 5e1e0831701..78df19c67ae 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWidgetWithinStringInlineWYSIWYGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWidgetWithinStringInlineWYSIWYGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAlignmentInheritanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAlignmentInheritanceTest.xml
index 2cfec626b5c..ac1ea29cbcc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAlignmentInheritanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAlignmentInheritanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAreaInitalStatusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAreaInitalStatusTest.xml
index 2b3ea3c6dd6..72b19564ed1 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAreaInitalStatusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAreaInitalStatusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,11 +24,15 @@
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG1"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCanAddToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCanAddToColumnTest.xml
index acabb3f6b0e..3e34c86e54a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCanAddToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCanAddToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextCanAddToColumnTest">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-text"/>
             <group value="pagebuilder-addToColumn"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCannotAddToStageTest.xml
index e86a7d541be..c108aef75bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-text"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextContainingPageBuilderMarkupWontBreakStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextContainingPageBuilderMarkupWontBreakStageTest.xml
index 7d65ad2b399..50f5f2ee2a4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextContainingPageBuilderMarkupWontBreakStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextContainingPageBuilderMarkupWontBreakStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -40,5 +40,16 @@
         <waitForElementVisible selector="{{TextOnStage.base('1')}}" stepKey="waitForTextVisible"/>
         <seeElement selector="{{TextOnStage.base('1')}}" stepKey="seeText"/>
         <seeElement selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTestStringInText"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenDesktop"/>
+        <actionGroup ref="AdminSaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPageDesktop"/>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <dontSeeElement selector="{{HtmlOnStage.base('1')}}" stepKey="dontSeeHtmlCodeAfterSave"/>
+        <waitForElementVisible selector="{{TextOnStage.base('1')}}" stepKey="waitForTextVisibleAfterSave"/>
+        <seeElement selector="{{TextOnStage.base('1')}}" stepKey="seeTextAfterSave"/>
+        <seeElement selector="{{TextOnStage.text('1', PageBuilderTextProperty.value)}}" stepKey="seeTestStringInTextAfterSave"/>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCopyAndPasteAllTextInlineWYSIWYGTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCopyAndPasteAllTextInlineWYSIWYGTest.xml
index d4868944c14..c499b6cbc4d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCopyAndPasteAllTextInlineWYSIWYGTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextCopyAndPasteAllTextInlineWYSIWYGTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCETest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorWithoutTinyMCETest.xml
similarity index 96%
rename from app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCETest.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorWithoutTinyMCETest.xml
index 9de505b03cf..b7749d250bd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCETest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorWithoutTinyMCETest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -23,6 +23,9 @@
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPageB"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
         </before>
         <after>
@@ -42,6 +45,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDeleteTest.xml
index 1d7dd6e7942..a585a4b8cad 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledByDefaultWYSIWYGUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledByDefaultWYSIWYGUpdateAdvancedConfigurationValuesTest.xml
index 45b748391e5..ace1c707fac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledByDefaultWYSIWYGUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledByDefaultWYSIWYGUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,11 +22,15 @@
         </annotations>
         <before>
             <magentoCLI command="config:set cms/wysiwyg/enabled hidden" stepKey="disableByDefaultWYSIWYG" before="loginAsAdmin"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="disableByDefaultWYSIWYG"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="disableByDefaultWYSIWYG">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </before>
         <after>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG" before="logout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache" after="enableWYSIWYG"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache" after="enableWYSIWYG">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <waitForElementVisible selector="{{TextOnConfiguration.textArea}}" stepKey="waitForTextOnEditPanel" before="enterText"/>
         <fillField selector="{{TextOnConfiguration.textArea}}" userInput="{{PageBuilderTextProperty.value}}" stepKey="enterText"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml
index 2713c0a39c3..a45e78195c5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG1"/>
             <actionGroup ref="navigateToAPageWithPageBuilder" stepKey="navigateToAPageWithPageBuilder"/>
             <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
@@ -47,6 +50,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddTextTest.xml
index 7883dda6b5f..b748c595dde 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddVariableTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddVariableTest.xml
index 2f007df182f..e5e0a3f2a3d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddVariableTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddVariableTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddWidgetTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddWidgetTest.xml
index 6e822d865da..ed1a8353e9e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddWidgetTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddWidgetTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGUpdateAdvancedConfigurationValuesTest.xml
index 25f4aec06ce..d6dcc13b240 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDuplicateTest.xml
index 600a5c416c3..2986cf64f59 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2719"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHasNoRequiredTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHasNoRequiredTest.xml
index bc84b2c4457..9cbf2dce204 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHasNoRequiredTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHasNoRequiredTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHeightConsistencyBetweenStageAndStorefrontTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHeightConsistencyBetweenStageAndStorefrontTest.xml
index 56771f21f6d..589fa927fef 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHeightConsistencyBetweenStageAndStorefrontTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextHeightConsistencyBetweenStageAndStorefrontTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml
index 2ac4988b31c..6406ec69a2b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <magentoCLI command="config:set cms/wysiwyg/use_static_urls_in_catalog 1" stepKey="useStaticURLForMediaContentInWYSIWYG"/>
         </before>
@@ -39,6 +42,9 @@
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineTextEditingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineTextEditingTest.xml
index 01dc034cb50..bdf02191767 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineTextEditingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineTextEditingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineVariableEditingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineVariableEditingTest.xml
index b9a6b7ed5a4..48ed91f6011 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineVariableEditingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineVariableEditingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWYSIWYGWidgetAndVariableStyleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWYSIWYGWidgetAndVariableStyleTest.xml
index c1ae323596b..780d05a8eec 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWYSIWYGWidgetAndVariableStyleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWYSIWYGWidgetAndVariableStyleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,7 +24,9 @@
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
             <createData entity="_defaultCmsPage" stepKey="createCMSPageB"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createCMSPage$$"/>
             </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingSpecialCharacterTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingSpecialCharacterTest.xml
index 4d91399315f..6538d13ba78 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingSpecialCharacterTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingSpecialCharacterTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <!--
      /**
-      * Copyright © Magento, Inc. All rights reserved.
-      * See COPYING.txt for license details.
-      */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
     -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingTest.xml
index 4e11048a74e..06bf912db55 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWidgetEditingTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWysiwygUploadImageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWysiwygUploadImageTest.xml
index 8f44d7738d0..56cc7f7f235 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWysiwygUploadImageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineWysiwygUploadImageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextSaveEmptyTextContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextSaveEmptyTextContentTypeTest.xml
index a2566c68b15..52d44284876 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextSaveEmptyTextContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextSaveEmptyTextContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextTooltipMenusAreNotCutOffInFullScreenModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextTooltipMenusAreNotCutOffInFullScreenModeTest.xml
index ed799b38d47..dabb2474d83 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextTooltipMenusAreNotCutOffInFullScreenModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextTooltipMenusAreNotCutOffInFullScreenModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" before="enableWYSIWYG"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextUpdateAdvancedConfigurationValuesTest.xml
index 8acc06b5d39..f6197fe3890 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2700"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateAdvancedConfigurationDefaultValuesTest.xml
index 1194801c140..ad6cbb5cf80 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextValidateAdvancedConfigurationDefaultValuesTest">
@@ -17,6 +17,7 @@
             <testCaseId value="MC-2810"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateGeneralDefaultSettingsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateGeneralDefaultSettingsTest.xml
index 6a91c890690..05a238d1683 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateGeneralDefaultSettingsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextValidateGeneralDefaultSettingsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVariableCanWrapTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVariableCanWrapTest.xml
index fb3f2903da9..bab49936b6a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVariableCanWrapTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVariableCanWrapTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextVariableCanWrapTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml
index 29de053a441..7eb1f4ecdf8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifySelectionInlineWYSIWYG.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
+
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextVerifySelectionInlineWYSIWYG">
@@ -18,13 +19,9 @@
             <testCaseId value="MC-29450"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <skip>
-                <issueId value="MQE-2288" />
-            </skip>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
-            <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <actionGroup ref="CliEnableTinyMCEActionGroup" stepKey="enableTinyMCE" />
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         </before>
@@ -39,10 +36,12 @@
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection1">
             <argument name="contentType" value="PageBuilderTextContentType"/>
         </actionGroup>
-        <actionGroup ref="dragContentTypeToDropZone" stepKey="dragTextIntoStage">
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToContainer" stepKey="dragTextIntoStage">
             <argument name="contentType" value="PageBuilderTextContentType"/>
-            <argument name="containerTargetType" value="PageBuilderRowContentType"/>
-            <argument name="dropZoneIndex" value="2"/>
         </actionGroup>
         <actionGroup ref="focusTinyMCE" stepKey="focusTinyMCE"/>
         <!-- Create new Heading 2 -->
@@ -78,14 +77,16 @@
             <argument name="endY">{{TinyMCEPartialHeadingSelection.endY}}</argument>
         </helper>
         <actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus"/>
-        <actionGroup ref="assertSelectedText" stepKey="assertSelection">
-            <argument name="expectedSelectedText" value="TinyMCEPartialHeadingSelection"/>
-        </actionGroup>
+        <executeJS function="return jQuery('.inline-wysiwyg h2').text().substring(1, 11);" stepKey="selectionString"/>
+        <assertEquals stepKey="assertSelection">
+            <expectedResult type="string">{{TinyMCEPartialHeadingSelection.selection}}</expectedResult>
+            <actualResult type="variable">selectionString</actualResult>
+        </assertEquals>
         <reloadPage stepKey="reloadPage"/>
         <waitForPageLoad stepKey="waitForReload"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
         <actionGroup ref="scrollToTinyMCE" stepKey="scrollToTinyMCE2"/>
-        <!-- Select portion of paragraph text "es stri" -->
+        <!-- Select portion of paragraph text "t strin" -->
         <helper class="Magento\PageBuilder\Test\Mftf\Helper\SelectText" method="selectText" stepKey="selectTextInTinyMCE">
             <argument name="context">//div[contains(@class, 'inline-wysiwyg')]//p[2]</argument>
             <argument name="startX">{{TinyMCEPartialTextSelection.startX}}</argument>
@@ -94,9 +95,11 @@
             <argument name="endY">{{TinyMCEPartialTextSelection.endY}}</argument>
         </helper>
         <actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus2"/>
-        <actionGroup ref="assertSelectedText" stepKey="assertSelection2">
-            <argument name="expectedSelectedText" value="TinyMCEPartialTextSelection"/>
-        </actionGroup>
+        <executeJS function="return jQuery('.inline-wysiwyg p:last-child').text().substring(3, 10);" stepKey="selectionString2"/>
+        <assertEquals stepKey="assertSelection2">
+            <expectedResult type="string">{{TinyMCEPartialTextSelection.selection}}</expectedResult>
+            <actualResult type="variable">selectionString2</actualResult>
+        </assertEquals>
         <reloadPage stepKey="reloadPage2"/>
         <waitForPageLoad stepKey="waitForReload2"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
@@ -112,8 +115,10 @@
         </helper>
 
         <actionGroup ref="waitForTinyMCEInFocus" stepKey="waitForTinyMCEInFocus3"/>
-        <actionGroup ref="assertSelectedText" stepKey="assertSelection3">
-            <argument name="expectedSelectedText" value="TinyMCEHeadingVariableTextSelection"/>
-        </actionGroup>
+        <executeJS function="return jQuery('.inline-wysiwyg').text().substring(1, 35);" stepKey="selectionString3"/>
+        <assertEquals stepKey="assertSelection3">
+            <expectedResult type="string">{{TinyMCEHeadingVariableTextSelection.selection}}</expectedResult>
+            <actualResult type="variable">selectionString3</actualResult>
+        </assertEquals>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTextAreaOnTextContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTextAreaOnTextContentTypeTest.xml
index a7960b09d61..3000227cdb5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTextAreaOnTextContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTextAreaOnTextContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCETableToolbarOnPageBuilderStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCETableToolbarOnPageBuilderStageTest.xml
index 08d8476681b..ee4ae097f2a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCETableToolbarOnPageBuilderStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCETableToolbarOnPageBuilderStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextVerifyTinyMCETableToolbarOnPageBuilderStageTest">
@@ -17,7 +17,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pagebuilder-tinyMCE"/>
-            <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
 
         <before>
@@ -109,6 +109,7 @@
             <argument name="contentTypeIndex" value="1"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="3"/>
+            <argument name="offsetYCoordinate" value="10"/>
         </actionGroup>
 
         <!-- Initialize TinyMCE Table Toolbar & Verify All Table Toolbar Menu Items are Visible -->
@@ -171,6 +172,7 @@
             <argument name="contentTypeIndex" value="1"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="containerTargetIndex" value="1"/>
+            <argument name="offsetYCoordinate" value="10"/>
         </actionGroup>
 
         <!-- Initialize TinyMCE Table Toolbar & Verify All Table Toolbar Menu Items are Visible Again -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCEToolbarOnPageBuilderStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCEToolbarOnPageBuilderStageTest.xml
index c3f9ae63df3..b8cb4949b6c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCEToolbarOnPageBuilderStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextVerifyTinyMCEToolbarOnPageBuilderStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="TextVerifyTinyMCEToolbarOnPageBuilderStageTest">
@@ -17,7 +17,6 @@
             <testCaseId value="MC-3463"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
-            <group value="pr_exclude"/>
         </annotations>
         <before>
             <createData entity="_defaultCmsPage" stepKey="createCMSPage"/>
@@ -52,51 +51,31 @@
         <seeElement selector="{{WYSIWYGOnPageBuilderInline.textColor}}" stepKey="seeTextColor"/>
         <seeElement selector="{{WYSIWYGOnPageBuilderInline.backgroundColor}}" stepKey="seeBackgroundColor"/>
         <!--Verify FontSize-->
-        <comment userInput="Verify FontSize" stepKey="commentVerifyFontSize"/>
-        <click selector="{{WYSIWYGOnPageBuilderInline.fontSize}}" stepKey="clickOnFontSize"/>
-        <see userInput="10px" stepKey="see10px"/>
-        <see userInput="12px" stepKey="see12px"/>
-        <see userInput="14px" stepKey="see14px"/>
-        <see userInput="16px" stepKey="see16px"/>
-        <see userInput="18px" stepKey="see18px"/>
-        <see userInput="20px" stepKey="see20px"/>
-        <see userInput="24px" stepKey="see24px"/>
-        <see userInput="26px" stepKey="see26px"/>
-        <see userInput="28px" stepKey="see28px"/>
-        <see userInput="32px" stepKey="see32px"/>
-        <see userInput="34px" stepKey="see34px"/>
-        <see userInput="36px" stepKey="see36px"/>
-        <see userInput="38px" stepKey="see38px"/>
-        <see userInput="40px" stepKey="see40px"/>
-        <see userInput="42px" stepKey="see42px"/>
-        <see userInput="48px" stepKey="see48px"/>
-        <see userInput="52px" stepKey="see52px"/>
-        <see userInput="56px" stepKey="see56px"/>
-        <see userInput="64px" stepKey="see64px"/>
-        <see userInput="72px" stepKey="see72px"/>
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizeMinus}}" stepKey="clickOnFontSizeMinus"/>
+        <waitForElementVisible stepKey="see13px"  selector="{{WYSIWYGOnPageBuilderInline.fontSizeValue('font-size: 13px')}}"/>
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizeMinus}}" stepKey="clickOnFontSizeMinusAgain"/>
+        <waitForElementVisible stepKey="see12px" selector="//*[@data-mce-style and contains(@style, 'font-size: 12px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlus"/>
+        <waitForElementVisible stepKey="see13pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 13px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusOne"/>
+        <waitForElementVisible stepKey="see14pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 14px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusTwo"/>
+        <waitForElementVisible stepKey="see15pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 15px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusThree"/>
+        <waitForElementVisible stepKey="see16pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 16px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusFour"/>
+        <waitForElementVisible stepKey="see17pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 17px')]" />
+        <click selector="{{WYSIWYGOnPageBuilderInline.fontSizePlus}}" stepKey="clickOnFontSizePlusFive"/>
+        <waitForElementVisible stepKey="see18pxAfterPlus" selector="//*[@data-mce-style and contains(@style, 'font-size: 18px')]" />
         <!--Verify LineHeight-->
         <comment userInput="Verify LineHeight" stepKey="commentVerifyLineHeight"/>
         <click selector="{{WYSIWYGOnPageBuilderInline.lineHeight}}" stepKey="clickOnLineHeight"/>
-        <see userInput="10px" stepKey="seeLineHeight10px"/>
-        <see userInput="12px" stepKey="seeLineHeight12px"/>
-        <see userInput="14px" stepKey="seeLineHeight14px"/>
-        <see userInput="16px" stepKey="seeLineHeight16px"/>
-        <see userInput="18px" stepKey="seeLineHeight18px"/>
-        <see userInput="20px" stepKey="seeLineHeight20px"/>
-        <see userInput="24px" stepKey="seeLineHeight24px"/>
-        <see userInput="26px" stepKey="seeLineHeight26px"/>
-        <see userInput="28px" stepKey="seeLineHeight28px"/>
-        <see userInput="32px" stepKey="seeLineHeight32px"/>
-        <see userInput="34px" stepKey="seeLineHeight34px"/>
-        <see userInput="36px" stepKey="seeLineHeight36px"/>
-        <see userInput="38px" stepKey="seeLineHeight38px"/>
-        <see userInput="40px" stepKey="seeLineHeight40px"/>
-        <see userInput="42px" stepKey="seeLineHeight42px"/>
-        <see userInput="48px" stepKey="seeLineHeight48px"/>
-        <see userInput="52px" stepKey="seeLineHeight52px"/>
-        <see userInput="56px" stepKey="seeLineHeight56px"/>
-        <see userInput="64px" stepKey="seeLineHeight64px"/>
-        <see userInput="72px" stepKey="seeLineHeight72px"/>
+        <waitForText userInput="1.1" stepKey="seeValue1"/>
+        <waitForText userInput="1.2" stepKey="seeValue2"/>
+        <waitForText userInput="1.3" stepKey="seeValue3"/>
+        <waitForText userInput="1.4" stepKey="seeValue4"/>
+        <waitForText userInput="1.5" stepKey="seeValue5"/>
+        <waitForText userInput="2" stepKey="seeValue6"/>
         <!--Verify FontStyle on preview-->
         <comment userInput="Verify FontStyle on preview" stepKey="commentVerifyFontsizeOnPreview"/>
         <clickWithLeftButton x="10" y="10" selector="{{TextOnStage.tinymce('1')}}" stepKey="focusOnEditorArea"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextDefaultStateTest.xml
index 5b321793406..e96af8ae935 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-text"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextTest.xml
index 2966399435d..dbfd1d16835 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/ValidateShowHideOnTextTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-text"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/CanAddVideoToColumnTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/CanAddVideoToColumnTest.xml
index 9e20c2508ba..7d48b9a1b79 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/CanAddVideoToColumnTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/CanAddVideoToColumnTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="CanAddVideoToColumnTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoDefaultStateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoDefaultStateTest.xml
index a9e0b24c0ec..f350c07fdcd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoDefaultStateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoDefaultStateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-video"/>
             <group value="pagebuilder-hideShow"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoTest.xml
index f9e9e38145e..e821e1653aa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/ValidateShowHideOnVideoTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
             <group value="pagebuilder-hideShow"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoAddToCMSPageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoAddToCMSPageTest.xml
index e387d4d4a6d..acabd5260de 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoAddToCMSPageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoAddToCMSPageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2765"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoCannotAddToStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoCannotAddToStageTest.xml
index 02662ded5b1..44e360f8b87 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoCannotAddToStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoCannotAddToStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-video"/>
             <group value="pagebuilder-cannotAddToStage"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDeleteTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDeleteTest.xml
index a5a95405efc..e23608fe864 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDeleteTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDeleteTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDuplicateTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDuplicateTest.xml
index 56dd62b2ff0..cf516e2c8f3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDuplicateTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoDuplicateTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-3387"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoHeightRendersCorrectlyBasedOnMaxWidthAndAspectRatioTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoHeightRendersCorrectlyBasedOnMaxWidthAndAspectRatioTest.xml
index 5481ce26813..13884ec8d00 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoHeightRendersCorrectlyBasedOnMaxWidthAndAspectRatioTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoHeightRendersCorrectlyBasedOnMaxWidthAndAspectRatioTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-18149"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
             <argument name="contentType" value="PageBuilderVideoContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoMoveVideoTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoMoveVideoTest.xml
index 16e138819a6..84cee163f90 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoMoveVideoTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoMoveVideoTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="VideoMoveVideoTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
             <group value="pagebuilder-column"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoNonEmbeddedUrlTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoNonEmbeddedUrlTest.xml
index fd3ec2ae1b4..eb829aa2138 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoNonEmbeddedUrlTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoNonEmbeddedUrlTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2569"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoUpdateAdvancedConfigurationValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoUpdateAdvancedConfigurationValuesTest.xml
index f28d47b914f..117d0846588 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoUpdateAdvancedConfigurationValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoUpdateAdvancedConfigurationValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2667"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAdvancedConfigurationDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAdvancedConfigurationDefaultValuesTest.xml
index 8188314bdcc..42f5d06111d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAdvancedConfigurationDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAdvancedConfigurationDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="VideoValidateAdvancedConfigurationDefaultValuesTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayDisabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayDisabled.xml
index 63a1d54cc39..576ca431834 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayDisabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayDisabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -45,13 +46,13 @@
             <argument name="contentType" value="PageBuilderVideoContentType"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterVideoUrlProperty">
-            <argument name="property" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="property" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
         <!-- Validate Stage -->
         <actionGroup ref="validateVideoNotAutoplaying" stepKey="validateVideoNotPlayingStage">
             <argument name="page" value="VideoOnStage"/>
-            <argument name="url" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="url" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
@@ -59,13 +60,13 @@
         <!-- Validate Stage After Save -->
         <actionGroup ref="validateVideoNotAutoplaying" stepKey="validateVideoNotPlayingStage2">
             <argument name="page" value="VideoOnStage"/>
-            <argument name="url" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="url" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
             <argument name="contentType" value="PageBuilderVideoContentType"/>
         </actionGroup>
         <actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeVideoUrlInAdmin">
-            <argument name="property" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="property" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="seeOptionIsNotCheckedSlideOutProperty" stepKey="seeAutoplayDisabledAfterSave">
             <argument name="property" value="PageBuilderVideoAutoplay_Disabled"/>
@@ -76,7 +77,7 @@
         <!-- Validate Storefront -->
         <actionGroup ref="validateVideoNotAutoplaying" stepKey="validateVideoPlayingStorefront">
             <argument name="page" value="VideoOnStorefront"/>
-            <argument name="url" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="url" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayEnabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayEnabled.xml
index 34d76e40d3b..d2dda964433 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayEnabled.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayEnabled.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -44,7 +44,7 @@
             <argument name="contentType" value="PageBuilderVideoContentType"/>
         </actionGroup>
         <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterVideoUrlProperty">
-            <argument name="property" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="property" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setAutoplayEnabled">
             <argument name="property" value="PageBuilderVideoAutoplay_Enabled"/>
@@ -53,7 +53,7 @@
         <!-- Validate Stage -->
         <actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStage">
             <argument name="page" value="VideoOnStage"/>
-            <argument name="url" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="url" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
@@ -61,13 +61,13 @@
         <!-- Validate Stage After Save -->
         <actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStage2">
             <argument name="page" value="VideoOnStage"/>
-            <argument name="url" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="url" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStage2">
             <argument name="contentType" value="PageBuilderVideoContentType"/>
         </actionGroup>
         <actionGroup ref="seeInFieldSlideOutProperty" stepKey="seeVideoUrlInAdmin">
-            <argument name="property" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="property" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
         <actionGroup ref="seeOptionIsCheckedSlideOutProperty" stepKey="seeAutoplayEnabledAfterSave">
             <argument name="property" value="PageBuilderVideoAutoplay_Enabled"/>
@@ -78,7 +78,7 @@
         <!-- Validate Storefront -->
         <actionGroup ref="validateVideoPlaying" stepKey="validateVideoPlayingStorefront">
             <argument name="page" value="VideoOnStorefront"/>
-            <argument name="url" value="PageBuilderVideoUrl_YouTube"/>
+            <argument name="url" value="PageBuilderVideoUrl_Cloud"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayPlaysinlineMp4Enabled.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayPlaysinlineMp4Enabled.xml
new file mode 100644
index 00000000000..b2a58fa6289
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateAutoplayPlaysinlineMp4Enabled.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="VideoValidateAutoplayPlaysinlineMp4Enabled">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Video"/>
+            <title value="Validate Video Playsinline Autoplay Attribute"/>
+            <description value="Validate that setting the autoplay attribute in the General form for Video will also add the playsinline attribute to the video tag in order for autoplay to work on mobile Safari browser"/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="ACP2E-1654"/>
+            <testCaseId value="AC-8149"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-video"/>
+        </annotations>
+        <before>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Add an autoplay video to the CMS page -->
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="addPageBuilderPageTitle" stepKey="enterPageTitle">
+            <argument name="contentType" value="PageBuilderVideoContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
+            <argument name="contentType" value="PageBuilderVideoContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragVideoIntoStage">
+            <argument name="contentType" value="PageBuilderVideoContentType"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
+            <argument name="contentType" value="PageBuilderVideoContentType"/>
+        </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterVideoUrlProperty">
+            <argument name="property" value="PageBuilderVideoUrl_Mp4_URL"/>
+        </actionGroup>
+        <actionGroup ref="conditionalClickSlideOutPanelFieldGeneral" stepKey="setAutoplayEnabled">
+            <argument name="property" value="PageBuilderVideoAutoplay_Enabled"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
+        <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
+
+        <!-- Validate that the added autoplay video will have playsinline tag at the storefront -->
+        <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
+            <argument name="page" value="$$createCMSPage.identifier$$"/>
+        </actionGroup>
+        <actionGroup ref="ValidateFullScreenVideoHasPlaysinlineAttributeActionGroup" stepKey="validateVideoPlaysinlineAttribute"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateGeneralDefaultValuesTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateGeneralDefaultValuesTest.xml
index 2934c96c447..2176880453d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateGeneralDefaultValuesTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateGeneralDefaultValuesTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,6 +18,7 @@
             <testCaseId value="MC-2596"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateURLTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateURLTest.xml
index 0646dcb0b58..a09674e1ef8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateURLTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoValidateURLTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-video"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -90,6 +91,18 @@
             <argument name="page" value="VideoOnStage"/>
             <argument name="url" value="PageBuilderVideoUrl_YouTube_Insecure"/>
         </actionGroup>
+        <!-- Update to YouTube Nocookie -->
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageYouTubeNocookie">
+            <argument name="contentType" value="PageBuilderVideoContentType"/>
+        </actionGroup>
+        <actionGroup ref="fillSlideOutPanelFieldGeneral" stepKey="enterVideoUrlYouTubeNocookie">
+            <argument name="property" value="PageBuilderVideoUrl_YouTube_Nocookie"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsNocookie"/>
+        <actionGroup ref="validateVideoWithOnlyVideoUrl" stepKey="validateYouTubeNocookieStage">
+            <argument name="page" value="VideoOnStage"/>
+            <argument name="url" value="PageBuilderVideoUrl_YouTube_Nocookie"/>
+        </actionGroup>
         <!-- Update to Vimeo Embedded-->
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditMenuOnStageVimeoEmbedded">
             <argument name="contentType" value="PageBuilderVideoContentType"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoWithBordersAndPaddingEqualToMaxWidthTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoWithBordersAndPaddingEqualToMaxWidthTest.xml
index 9ed9d75858a..a34d9f01f47 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoWithBordersAndPaddingEqualToMaxWidthTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/VideoWithBordersAndPaddingEqualToMaxWidthTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationDefaultColumnGridSizeFieldAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationDefaultColumnGridSizeFieldAppearanceTest.xml
index 19f42bb25d5..c65f9471548 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationDefaultColumnGridSizeFieldAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationDefaultColumnGridSizeFieldAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSizeConfig"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationGridSettingsValidationInSystemConfigTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationGridSettingsValidationInSystemConfigTest.xml
index 883e80a72b3..98539130595 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationGridSettingsValidationInSystemConfigTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationGridSettingsValidationInSystemConfigTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSizeConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -30,7 +31,9 @@
         <after>
             <magentoCLI command="config:set cms/pagebuilder/column_grid_default 12" stepKey="setDefaultGridSize"/>
             <magentoCLI command="config:set cms/pagebuilder/column_grid_max 16" stepKey="setMaxGridSize"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <conditionalClick stepKey="uncheckUseSystemValueDefault" selector="{{ContentManagementSection.UseSystem('column_grid_default')}}" dependentSelector="{{ContentManagementSection.UseSystemChecked('column_grid_default')}}" visible="true"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationMaximumColumnGridSizeFieldAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationMaximumColumnGridSizeFieldAppearanceTest.xml
index 3b9c913e707..591afca724b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationMaximumColumnGridSizeFieldAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderColumnGridTest/StoreConfigurationMaximumColumnGridSizeFieldAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -21,6 +21,7 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-columnGridSizeConfig"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyFieldAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyFieldAppearanceTest.xml
index 9c4bb05b146..704b2e64da8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyFieldAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyFieldAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsAPIKey"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonChangesStateAndMessagesCorrectlyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonChangesStateAndMessagesCorrectlyTest.xml
index d06dfbd8c85..bd3a66b2f4d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonChangesStateAndMessagesCorrectlyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonChangesStateAndMessagesCorrectlyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonInvalidKeysTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonInvalidKeysTest.xml
index 8618064c366..51c085be60f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonInvalidKeysTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonInvalidKeysTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsAPIKey"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonValidKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonValidKeyTest.xml
index 6af1c82965e..f93839ea012 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonValidKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsAPIKeyTestKeyButtonValidKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveEmptyAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveEmptyAPIKeyTest.xml
index 969432e4bcb..97f02da9326 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveEmptyAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveEmptyAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsAPIKey"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveInvalidAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveInvalidAPIKeyTest.xml
index b472417daef..ce37f4fd9f7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveInvalidAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveInvalidAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsAPIKey"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveValidAPIKeyTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveValidAPIKeyTest.xml
index 5eb16a5736f..7a21aaa3a14 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveValidAPIKeyTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsAPIKeyTest/StoreConfigurationGoogleMapsCanSaveValidAPIKeyTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveEmptyStyleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveEmptyStyleTest.xml
index 62c4065f0b9..1b6a9ecebc0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveEmptyStyleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveEmptyStyleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsStyle"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveValidStyleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveValidStyleTest.xml
index 9abb062c04b..8745bd429e6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveValidStyleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCanSaveValidStyleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsStyle"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCannotSaveInvalidStyleTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCannotSaveInvalidStyleTest.xml
index 16ebfa63cf8..b9dfa50e2db 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCannotSaveInvalidStyleTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsCannotSaveInvalidStyleTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsStyle"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsStyleFieldAppearanceTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsStyleFieldAppearanceTest.xml
index 1b38af5c074..771c29fbe2c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsStyleFieldAppearanceTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderGoogleMapsStyleTest/StoreConfigurationGoogleMapsStyleFieldAppearanceTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,7 @@
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-googleMapsStyle"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ProductMetaDescriptionMaskTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ProductMetaDescriptionMaskTest.xml
new file mode 100644
index 00000000000..016c65d4227
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ProductMetaDescriptionMaskTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="ProductMetaDescriptionMaskTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Store Configuration - Check product meta description mask"/>
+            <title value="Check product meta description mask"/>
+            <description value="When Page Builder is installed, product meta description mask should be set to {{name}}"/>
+            <severity value="MINOR"/>
+            <testCaseId value="AC-7086"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-store-configuration"/>
+            <group value="pagebuilder-enable"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPage" />
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <seeInField selector="{{AdminCatalogProductFieldsAutoGenerationSection.metaDescriptionInput}}" userInput="{{name}}" stepKey="seeProductMetaDescription"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/SpecificACLAdminUserCheckProductContentEditWithPageBuilderTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/SpecificACLAdminUserCheckProductContentEditWithPageBuilderTest.xml
new file mode 100644
index 00000000000..8f30e186c7e
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/SpecificACLAdminUserCheckProductContentEditWithPageBuilderTest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="SpecificACLAdminUserCheckProductContentEditWithPageBuilderTest">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Catalog Products"/>
+            <title value="Specific ACL Admin user verify product content modify with Page Builder"/>
+            <description value="This test is designed to make sure that a limited admin user can effectively save the basic product content using PageBuilder.."/>
+            <severity value="MAJOR"/>
+            <useCaseId value="ACP2E-1646"/>
+            <testCaseId value="AC-8107"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsLimitedAdmin"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="AdminDeleteCreatedUserActionGroup" stepKey="deleteAdminUser">
+                <argument name="user" value="Admin3"/>
+            </actionGroup>
+            <actionGroup ref="AdminDeleteUserRoleActionGroup" stepKey="deleteRole">
+                <argument name="roleName" value="{{limitedAccessRole.name}}"/>
+            </actionGroup>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin1"/>
+        </after>
+        <!-- Create a restricted role with access only to Catalog -->
+        <actionGroup ref="AdminCreateRoleWithoutScopeSelectionActionGroup" stepKey="createRestrictedRole">
+            <argument name="restrictedRole" value="Catalog"/>
+            <argument name="User" value="limitedAccessRole"/>
+        </actionGroup>
+        <actionGroup ref="AdminCreateUserWithRoleActionGroup" stepKey="createRestrictedAdmin">
+            <argument name="role" value="limitedAccessRole"/>
+            <argument name="user" value="Admin3"/>
+        </actionGroup>
+        <!-- Logout and login with newly created restricted user -->
+        <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAsAdmin"/>
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsLimitedAdmin">
+            <argument name="username" value="{{Admin3.username}}"/>
+            <argument name="password" value="{{Admin3.password}}"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="navigateToProductPage" >
+            <argument name="product" value="$$createSimpleProduct$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenContentSectionOnProductPageActionGroup" stepKey="openContentSection"/>
+        <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveProduct"/>
+        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="checkProductSavedMessage"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontProductCarouselAddToCartShouldNotReloadPage.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontProductCarouselAddToCartShouldNotReloadPage.xml
new file mode 100644
index 00000000000..a2ca28cf7c8
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontProductCarouselAddToCartShouldNotReloadPage.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductCarouselAddToCartShouldNotReloadPage">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Add to cart from Carousel"/>
+            <title value="Adding to cart from product widget carousel should not reload page"/>
+            <description value="Clicking on Add to Cart on product in carousel widget should not reload page, the request should be submitted asynchronously."/>
+            <severity value="AVERAGE"/>
+            <useCaseId value="ACP2E-703"/>
+            <testCaseId value="AC-2853"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-cms-page"/>
+            <group value="pagebuilder-products"/>
+            <group value="pagebuilder-productsCarousel"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Open the newly created CMS Page for editing -->
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+
+        <!-- Add the product widget with Page Builder, set it to carousel mode and assign the product category -->
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragOntoStage">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
+            <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy">
+            <argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
+        </actionGroup>
+        <actionGroup ref="selectCategoryFromCategoryDropDown" stepKey="selectCategory">
+            <argument name="category" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
+
+        <!-- Save the CMS Page -->
+        <actionGroup ref="SaveCmsPageActionGroup" stepKey="saveCMSPage"/>
+
+        <!-- Validate Add to Cart on the storefront -->
+        <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
+            <argument name="page" value="$$createCMSPage.identifier$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickProductAddToCartValidateAsyncActionGroup" stepKey="clickProductAddToCartInProductsCMSPageStorefront">
+            <argument name="product" value="$$createProduct.name$$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontProductMultipleWidgetsAddToCartSameProductOnce.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontProductMultipleWidgetsAddToCartSameProductOnce.xml
new file mode 100644
index 00000000000..482c2eb9951
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontProductMultipleWidgetsAddToCartSameProductOnce.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="StorefrontProductMultipleWidgetsAddToCartSameProductOnce">
+        <annotations>
+            <features value="PageBuilder"/>
+            <stories value="Add to cart from product widget"/>
+            <title value="Adding to cart from product widget when two widgets on the same page, should add to cart once"/>
+            <description value="The product should be added to the cart only once from the product widget when the CMS page contains two rows, the first row contains the regular product widget, and the second row contains the product carousel widget and both of them are displaying the same product"/>
+            <severity value="MAJOR"/>
+            <useCaseId value="ACP2E-1564"/>
+            <testCaseId value="AC-7939"/>
+            <group value="pagebuilder"/>
+            <group value="pagebuilder-cms-page"/>
+            <group value="pagebuilder-products"/>
+            <group value="pagebuilder-productsCarousel"/>
+        </annotations>
+        <before>
+            <createData entity="_defaultCategory" stepKey="createCategory"/>
+            <createData entity="_defaultProduct" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
+            <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
+            <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+
+        <!-- Open the newly created CMS Page for editing and expand the Page Builder editor -->
+        <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToCreatedCMSPage">
+            <argument name="CMSPage" value="$$createCMSPage$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenPageBuilderFromContentPreviewOverlayActionGroup" stepKey="openPageBuilderFullScreen"/>
+
+        <!-- Add the product widget with Page Builder, set it to carousel mode and assign the product category -->
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContent">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragOntoStage">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDrop">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="selectAppearance">
+            <argument name="property" value="PageBuilderProductsProductCarouselAppearance"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsBy">
+            <argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
+        </actionGroup>
+        <actionGroup ref="selectCategoryFromCategoryDropDown" stepKey="selectCategory">
+            <argument name="category" value="$$createCategory.name$$"/>
+        </actionGroup>
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettings"/>
+
+        <!-- Add the regular product widget with Page Builder and assign the product category -->
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragSecondRowToRootContainer">
+            <argument name="contentType" value="PageBuilderRowContentType"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
+        </actionGroup>
+        <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandMenuSectionAddContentForSecondRow">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="dragContentTypeToStage" stepKey="dragOntoStageForSecondRow">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditAfterDropForSecondRow">
+            <argument name="contentType" value="PageBuilderProductsContentType"/>
+        </actionGroup>
+        <actionGroup ref="chooseVisualSelectOption" stepKey="chooseSelectProductsByForSecondRow">
+            <argument name="property" value="PageBuilderProductsSelectProductsByCategory"/>
+        </actionGroup>
+        <actionGroup ref="selectCategoryFromCategoryDropDown" stepKey="selectCategoryForSecondRow">
+            <argument name="category" value="$$createCategory.name$$"/>
+        </actionGroup>
+
+        <!-- Save the Page Builder stage -->
+        <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsForSecondRow"/>
+        <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreenBeforeSave"/>
+
+        <!-- Save the CMS Page -->
+        <actionGroup ref="SaveCmsPageActionGroup" stepKey="saveCMSPage"/>
+
+        <!-- Validate Add to Cart on the storefront -->
+        <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront">
+            <argument name="page" value="$$createCMSPage.identifier$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickProductAddToCartValidateAsyncActionGroup" stepKey="clickProductAddToCartInProductsCMSPageStorefront">
+            <argument name="product" value="$$createProduct.name$$"/>
+        </actionGroup>
+
+        <!-- Validate the product was added to the cart just once -->
+        <see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantityToBeJustOne"/>
+        <actionGroup ref="StorefrontAssertProductQtyInMinicartActionGroup" stepKey="assertProductQtyInMinicartToBeJustOne">
+            <argument name="product" value="$$createProduct$$"/>
+            <argument name="qty" value="1"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml
index 2d2969c03db..a843f420ebc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/StorefrontReviewWithProductFullWidthLayoutTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,6 +32,7 @@
         <after>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
             <actionGroup ref="DeleteCustomerByEmailActionGroup" stepKey="deleteCustomer">
                 <argument name="email" value="{{CustomerEntityOne.email}}"/>
             </actionGroup>
@@ -68,7 +69,10 @@
         <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openCreatedProductPage">
             <argument name="productUrl" value="$$createProduct.custom_attributes[url_key]$$"/>
         </actionGroup>
-        <!-- Click on reviews and add review with current user -->
+        <comment userInput="BIC workaround" stepKey="scrollToQuality"/>
+        <comment userInput="BIC workaround" stepKey="clickButton1"/>
+        <comment userInput="BIC workaround" stepKey="clickButton2"/>
+        <comment userInput="BIC workaround" stepKey="clickButton3"/>
         <actionGroup ref="StorefrontAddProductReviewProductFullWidthLayoutActionGroup" stepKey="addReview"/>
         <!-- Go to "Pending reviews" page and clear filters -->
         <actionGroup ref="AdminOpenPendingReviewsPageActionGroup" stepKey="openReviewsPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml
index 5247cc7315c..a58af44bc88 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/TinyMCE/TinyMCEVerifyCatalogProductsListWidgetTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderEnableTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/VerifyPageBuilderSwitcherAndDisclaimerMessageTest.xml
similarity index 95%
rename from app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderEnableTest.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/Test/VerifyPageBuilderSwitcherAndDisclaimerMessageTest.xml
index ce89ace9367..fdf81adc9a6 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminStoreConfigurationPageBuilderEnableTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/VerifyPageBuilderSwitcherAndDisclaimerMessageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -19,6 +19,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-store-configuration"/>
             <group value="pagebuilder-enable"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -26,7 +27,9 @@
         <after>
             <magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="cache:clean config" stepKey="flushCache"/>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="config"/>
+            </actionGroup>
         </after>
         <amOnPage url="{{AdminContentManagementPage.url}}" stepKey="navigateToConfigurationPage" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminVerifyViewportSwitcherUITest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminVerifyViewportSwitcherUITest.xml
index f3c761278fe..b581b8987fa 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminVerifyViewportSwitcherUITest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminVerifyViewportSwitcherUITest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -17,6 +17,7 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-viewport-switcher"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -42,7 +43,7 @@
         <moveMouseOver selector="{{PageBuilderViewportSwitcherSection.viewportSwitcherButton('mobile')}}" stepKey="mouseOverMobileViewportButton"/>
         <waitForElementVisible selector="{{PageBuilderViewportSwitcherSection.viewportTooltipLabel('2', 'Mobile')}}" stepKey="verifyMobileTooltipLabel"/>
         <waitForText userInput="View your content for mobile" selector="{{PageBuilderViewportSwitcherSection.viewportTooltipContent('2')}}" stepKey="verifyMobileTooltipContent"/>
-        <waitForText userInput="Width: 768px" selector="{{PageBuilderViewportSwitcherSection.viewportTooltipContent('2')}}" stepKey="verifyMobileTooltipContent2"/>
+        <waitForText userInput="Width: 767px" selector="{{PageBuilderViewportSwitcherSection.viewportTooltipContent('2')}}" stepKey="verifyMobileTooltipContent2"/>
         <!-- Verify Desktop Viewport Area -->
         <actionGroup ref="AdminSwitchPageBuilderViewportActionGroup" stepKey="switchToDesktopViewport">
             <argument name="viewportButton"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminViewportSwitcherMobileVerifyCannotResizeColumnsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminViewportSwitcherMobileVerifyCannotResizeColumnsTest.xml
index 788253a8d9e..90540e91a65 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminViewportSwitcherMobileVerifyCannotResizeColumnsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/AdminViewportSwitcherMobileVerifyCannotResizeColumnsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminViewportSwitcherMobileVerifyCannotResizeColumnsTest">
@@ -18,6 +18,7 @@
             <group value="pagebuilder-columnResize"/>
             <group value="pagebuilder-viewport-switcher"/>
             <group value="pr_exclude"/>
+            <group value="cloud"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileAddChildContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileAddChildContentTypesFromOnHoverOptionMenusTest.xml
index 06da47e2398..1c74fd1bdac 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileAddChildContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileAddChildContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -41,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml
index 52082353f2b..c247167a6c0 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageCenteredAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index 0797e4a9c0d..2b9fb21a488 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -41,7 +44,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -51,6 +54,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <actionGroup ref="expandPageBuilderPanelMenuSection" stepKey="expandPageBuilderPanelMenuSection">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index 084ac67cc47..e56554951fd 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerMinHeightTest.xml
index 1d3af5117a3..437f7bbdddf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileBannerMinHeightTest" extends="ViewportSwitcherMobileRowMinHeightTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml
index 3f78a48e070..808b9adc22a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -39,7 +42,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -52,6 +55,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->
@@ -419,6 +425,8 @@
             <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColorDefaultProperty.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseSlideStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="moveMouseOverBannerCMSPageStorefront"/>
         <wait time="3" stepKey="waitAfterMouseOverBannerCMSPageStorefront"/>
         <waitForElementVisible selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefront"/>
@@ -472,7 +480,12 @@
         </actionGroup>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerCMSPageStorefrontMobile"/>
         <wait time="3" stepKey="waitAfterMouseOverBannerCMSPageStorefrontMobile"/>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseSlideStageOutsideStorefrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStorefrontMobile"/>
+        <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerCMSPageStorefrontMobileAgain"/>
+        <wait time="2" stepKey="pause3"/>
         <waitForElementVisible selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefrontMobile"/>
+        <wait time="5" stepKey="pause4"/>
         <actionGroup ref="ValidateContentTypesStyleEqualsExpectedStyleActionGroup" stepKey="seeOverlayOnHoverCMSPageStorefrontMobile">
             <argument name="selector" value="{{BannerOnFrontend.overlay('1')}}"/>
             <argument name="expectedProperty" value="{{PageBuilderBannerOverlayColor_Blue_Opaque.rgb}}"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml
index 66008e306d7..c899bd92aca 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         <before>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
             </actionGroup>
@@ -36,7 +39,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
@@ -45,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Banner -->
@@ -58,7 +64,7 @@
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
             <argument name="contentType" value="PageBuilderBannerContentType"/>
         </actionGroup>
-        <attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
+        <attachFile selector="{{PageBuilderStage.uploadImageInputWithUploaderId('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <!-- Validate Stage Mobile Viewport -->
         <actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBlockThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBlockThroughBlockContentTypeTest.xml
index 772e7f763ac..f38b68b6fd8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBlockThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBlockThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqBlock" stepKey="deletePreReqBlock"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonItemCanBeEditedInlineTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonItemCanBeEditedInlineTest.xml
index 83335cc793a..9d9e5638dde 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonItemCanBeEditedInlineTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonItemCanBeEditedInlineTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -36,7 +36,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeInlineSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeInlineSameSizeTest.xml
index e23a76bd610..a6e8100fc71 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeInlineSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeInlineSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
similarity index 99%
rename from app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
rename to app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
index 7ffc7329cbc..8dcadf93ba4 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileButtonsThroughBlockContentTypeStackedNotSameSizeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml
index 9671e375ce7..c9d8f41ebfc 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnBottomAlignmentAppearanceThroughBlockContentTypeTest" extends="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
@@ -33,11 +33,11 @@
         <!-- Validate CMS Block Stage Desktop Viewport -->
         <actionGroup ref="validateColumnAppearanceBottomAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
             <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
-            <argument name="height" value="PageBuilderMinHeightProperty_75"/>
+            <argument name="height" value="PageBuilderMinHeightProperty_150"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
             <argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
-            <argument name="minHeight" value="{{PageBuilderMinHeightProperty_75.value}}"/>
+            <argument name="minHeight" value="{{PageBuilderMinHeightProperty_150.value}}"/>
             <argument name="index" value="1"/>
         </actionGroup>
 
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml
index fd6d9090113..b60480dd8e9 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnCenterAlignmentAppearanceThroughBlockContentTypeTest" extends="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
@@ -33,11 +33,11 @@
         <!-- Validate CMS Block Stage Desktop Viewport -->
         <actionGroup ref="validateColumnAppearanceCenterAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
             <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
-            <argument name="height" value="PageBuilderMinHeightProperty_75"/>
+            <argument name="height" value="PageBuilderMinHeightProperty_150"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
             <argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
-            <argument name="minHeight" value="{{PageBuilderMinHeightProperty_75.value}}"/>
+            <argument name="minHeight" value="{{PageBuilderMinHeightProperty_150.value}}"/>
             <argument name="index" value="1"/>
         </actionGroup>
 
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml
index 850f227cb06..0736dd67e78 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
@@ -23,6 +23,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -37,7 +40,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -50,6 +53,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Columns -->
@@ -154,6 +160,7 @@
         </actionGroup>
         <actionGroup ref="validateColumnAppearanceFullHeight" stepKey="validateColumn1AppearanceCMSBlockStage">
             <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
+            <argument name="acceptableOffset" value="3"/>
         </actionGroup>
         <actionGroup ref="ValidateAllBackgroundAttributesActionGroup" stepKey="validateBackgroundCMSBlockStage">
             <argument name="section" value="ColumnOnBackend"/>
@@ -173,7 +180,7 @@
         <actionGroup ref="ValidateLayoutConfigurationWithAllUpdatedActionGroup" stepKey="validateLayoutCMSBlockStage">
             <argument name="page" value="ColumnOnBackend"/>
             <argument name="index" value="1"/>
-            <argument name="minHeight" value="PageBuilderMinHeightProperty_Auto"/>
+            <argument name="minHeight" value="PageBuilderMinHeightProperty_150"/>
             <argument name="verticalAlignContainer" value="PageBuilderVerticalAlignmentPropertyCenter"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnMinHeightTest.xml
index c4ab0950cc6..f6165c5c8bb 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml
index 5b722c44da0..4e8d19079a2 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnTopAlignmentAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileColumnTopAlignmentAppearanceThroughBlockContentTypeTest" extends="ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest">
@@ -32,11 +32,11 @@
         <!-- Validate CMS Block Stage Desktop Viewport -->
         <actionGroup ref="validateColumnAppearanceTopAligned" stepKey="validateColumn1AppearanceCMSBlockStage">
             <argument name="affordanceValue" value="{{PageBuilderColumnAffordanceHeight.value}}"/>
-            <argument name="height" value="PageBuilderMinHeightProperty_75"/>
+            <argument name="height" value="PageBuilderMinHeightProperty_150"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder" stepKey="validateColumn1HeightCMSBlockStage">
             <argument name="content" value="{{ColumnOnBackend.baseCSS}}"/>
-            <argument name="minHeight" value="{{PageBuilderMinHeightProperty_75.value}}"/>
+            <argument name="minHeight" value="{{PageBuilderMinHeightProperty_150.value}}"/>
             <argument name="index" value="1"/>
         </actionGroup>
 
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileContainedRowThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileContainedRowThroughBlockContentTypeTest.xml
index e8b58a13481..58451879529 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileContainedRowThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileContainedRowThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDefaultProductsCarouselThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDefaultProductsCarouselThroughBlockContentTypeTest.xml
index 28d1d44d9fb..bdc80bce27a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDefaultProductsCarouselThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDefaultProductsCarouselThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -58,7 +58,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct6" stepKey="deleteProduct6"/>
             <deleteData createDataKey="createProduct5" stepKey="deleteProduct5"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnClickOptionMenusTest.xml
index 4deff1fca3d..100ce83e1e8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -41,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnHoverOptionMenusTest.xml
index 85538eafb5a..1f196b5c25a 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDeleteContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -41,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDividerThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDividerThroughBlockContentTypeTest.xml
index 21bcaa07b71..b085917c41f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDividerThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDividerThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnClickOptionMenusTest.xml
index 22b3a6a9f66..739accd5bbe 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -41,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml
index 517858cec1e..a883816fe8d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileDuplicateContentTypesFromOnHoverOptionMenusTest">
@@ -40,7 +40,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDynamicBlockThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDynamicBlockThroughBlockContentTypeTest.xml
index 98d1590797b..d70a0b61b70 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDynamicBlockThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileDynamicBlockThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -43,7 +43,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <comment userInput="BIC workaround" stepKey="deleteDynamicBlock"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnClickOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnClickOptionMenusTest.xml
index d6fb21f016a..53c9f823744 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnClickOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnClickOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -41,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnHoverOptionMenusTest.xml
index 82f6c5961a5..b06e1968b4b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -41,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditTabNameByClickingOnHeaderInStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditTabNameByClickingOnHeaderInStageTest.xml
index 8818281e888..3abff73719b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditTabNameByClickingOnHeaderInStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileEditTabNameByClickingOnHeaderInStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -35,7 +35,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullBleedRowMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullBleedRowMinHeightThroughBlockContentTypeTest.xml
index 5ade794e067..1e5cd42f751 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullBleedRowMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullBleedRowMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullWidthRowMinHeightThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullWidthRowMinHeightThroughBlockContentTypeTest.xml
index cf399daba02..af5d66ce053 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullWidthRowMinHeightThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileFullWidthRowMinHeightThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml
index e3f3902daae..3b17b440f96 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -38,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -53,6 +56,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add HTML -->
@@ -213,7 +219,7 @@
         <seeElement selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="seeRenderedHtmlCMSPageStorefront"/>
         <click selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="clickRenderedHtmlButtonCMSPageStorefront"/>
         <wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefront"/>
-        <seeCurrentUrlEquals url="{{PageBuilderHtmlPropertyButton.url}}" stepKey="seeThatUrlIsChangedToHtmlLinkUrl"/>
+        <seeCurrentUrlMatches regex="~^{{PageBuilderHtmlPropertyButton.url}}.*~" stepKey="seeThatUrlIsChangedToHtmlLinkUrl"/>
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
@@ -237,7 +243,7 @@
         <seeElement selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="seeRenderedHtmlCMSPageStorefrontMobile"/>
         <click selector="{{HtmlOnStorefront.html('1', PageBuilderHtmlPropertyButton.selectorOnFrontend)}}" stepKey="clickRenderedHtmlButtonCMSPageStorefrontMobile"/>
         <wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefrontMobile"/>
-        <seeCurrentUrlEquals url="{{PageBuilderHtmlPropertyButton.url}}" stepKey="seeThatUrlIsChangedToHtmlLinkUrlMobile"/>
+        <seeCurrentUrlMatches regex="~^{{PageBuilderHtmlPropertyButton.url}}.*~" stepKey="seeThatUrlIsChangedToHtmlLinkUrlMobile"/>
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2Mobile">
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingEditTypeH1StageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingEditTypeH1StageTest.xml
index c12886ed541..64d83205e48 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingEditTypeH1StageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingEditTypeH1StageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -35,7 +35,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingThroughBlockContentTypeTest.xml
index 1a00502a621..1c1ea3bb58c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHeadingThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageContentUploadFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageContentUploadFromStageTest.xml
index e18d1d425cc..bc0261d48bf 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageContentUploadFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageContentUploadFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -20,6 +20,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
@@ -35,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
@@ -50,6 +53,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Image -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageThroughBlockContentTypeTest.xml
index 41bee24d6f2..65c1ec6bca7 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -38,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -54,6 +57,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Image -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveButtonItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveButtonItemsTest.xml
index 8876733fcc0..938590e2b23 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveButtonItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveButtonItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveContentTypesFromOnHoverOptionMenusTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveContentTypesFromOnHoverOptionMenusTest.xml
index 3f6bdb73ac9..f5ed936fc44 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveContentTypesFromOnHoverOptionMenusTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveContentTypesFromOnHoverOptionMenusTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileMoveContentTypesFromOnHoverOptionMenusTest">
@@ -42,7 +42,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="NavigateToAndResetProductGridToDefaultViewActionGroup" stepKey="NavigateToAndResetProductGridToDefaultView"/>
@@ -76,14 +76,14 @@
         </actionGroup>
         <!-- Validate Stage -->
         <actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateHeadingPosition">
-            <argument name="contentType" value="PageBuilderDividerContentType"/>
+            <argument name="contentType" value="PageBuilderHeadingContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="positionInContainer" value="1"/>
             <argument name="contentTypeIndex" value="1"/>
             <argument name="containerTargetIndex" value="2"/>
         </actionGroup>
         <actionGroup ref="validateContentTypeInsideContainerStage" stepKey="validateDividerPosition">
-            <argument name="contentType" value="PageBuilderHeadingContentType"/>
+            <argument name="contentType" value="PageBuilderDividerContentType"/>
             <argument name="containerTargetType" value="PageBuilderColumnContentType"/>
             <argument name="positionInContainer" value="2"/>
             <argument name="contentTypeIndex" value="1"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveSlideItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveSlideItemsTest.xml
index 9b998af6b74..a8c08b0a033 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveSlideItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveSlideItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveTabItemsTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveTabItemsTest.xml
index d7cd17fb85c..a104767370f 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveTabItemsTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileMoveTabItemsTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqCategory" stepKey="deleteCreatedCategory"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
index 919f7d36057..667ba91c391 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsCarouselVerifyProductItemsInteractionsOnStorefrontInDefaultCarouselModeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -43,7 +43,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCreatedCategory"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsThroughBlockContentTypeTest.xml
index 95988031c4d..54b1091a530 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileProductsThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -49,7 +49,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteCreatedProduct1"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteCreatedProduct2"/>
             <deleteData createDataKey="createProduct3" stepKey="deleteCreatedProduct3"/>
@@ -225,7 +225,7 @@
         <actionGroup ref="clickProductAddToWishListInProductsOnStorefront" stepKey="clickProductAddToWishListInProductsCMSPageStorefrontMobile">
             <argument name="product" value="$$createProduct2.name$$"/>
         </actionGroup>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
         <!-- Edit Number Of Products To Display -->
         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage2">
             <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileRowMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileRowMinHeightTest.xml
index be25bec604a..0c9b1e4148c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileRowMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileRowMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileRowMinHeightTest">
@@ -32,7 +32,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml
index c75f7d15c55..67d1018707c 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageCenterAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index 4a2a74d0077..355fab992d8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
@@ -41,7 +44,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -51,6 +54,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteFallbackImage">
                 <argument name="Image" value="PageBuilderVideoBackgroundFallbackImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider to Stage -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
index b0ea8e7e6a0..e03a5df0207 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageRightAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemMinHeightTest.xml
index a4be2b23f0d..f5f4d27b384 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileSlideItemMinHeightTest" extends="ViewportSwitcherMobileRowMinHeightTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml
index cc9d0f3725a..c15f5f4fcc3 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -25,6 +25,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -39,7 +42,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -52,6 +55,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
@@ -422,6 +428,8 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseSlideStageOutside"/>
+        <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="moveMouseOverSlideCMSPageStorefront"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefront"/>
         <seeElement selector="{{SlideOnFrontend.buttonText('1', PageBuilderSlideItemButtonText_Common.value)}}" stepKey="seeButtonTextOnHoverCMSPageStorefront"/>
@@ -489,6 +497,8 @@
             <argument name="expectedProperty" value="{{PageBuilderBackgroundColor_Transparent.rgb}}"/>
             <argument name="cssProperty" value="backgroundColor"/>
         </actionGroup>
+        <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseSlideStageOutsideStoreFrontMobile"/>
+        <wait time="5" stepKey="pauseAfterIconHoverStoreFrontMobile"/>
         <moveMouseOver selector="{{SlideOnFrontend.appearance('1', PageBuilderAppearance_Poster.value)}}" stepKey="moveMouseOverSlideCMSPageStorefrontMobile"/>
         <seeElement selector="{{SlideOnFrontend.button('1')}}" stepKey="seeButtonOnHoverCMSPageStorefrontMobile"/>
         <seeElement selector="{{SlideOnFrontend.buttonText('1', PageBuilderSlideItemButtonText_Common.value)}}" stepKey="seeButtonTextOnHoverCMSPageStorefrontMobile"/>
@@ -516,4 +526,4 @@
         <wait time="3" stepKey="waitArbitraryTimeForPotentialNavigationToOccurCMSPageStorefrontMobile"/>
         <seeCurrentUrlEquals url="{{PageBuilderSlideItemLinkURL_External.value}}" stepKey="seeThatUrlIsChangedToButtonUrlCMSPageStorefrontMobile"/>
     </test>
-</tests>
\ No newline at end of file
+</tests>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml
index cce8c766ac3..a3421a0cbe5 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -22,6 +22,9 @@
         <before>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage1">
                 <argument name="CMSPage" value="$$createPreReqCMSPage$$"/>
             </actionGroup>
@@ -36,7 +39,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
@@ -45,6 +48,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
                 <argument name="Image" value="PageBuilderBackgroundImage_JPG"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Slider -->
@@ -58,7 +64,7 @@
         <actionGroup ref="verifyUploadImageButtons" stepKey="verifyUploadImageButtons">
             <argument name="contentType" value="PageBuilderSliderContentType"/>
         </actionGroup>
-        <attachFile selector="{{PageBuilderStage.uploadImageInput('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
+        <attachFile selector="{{PageBuilderStage.uploadImageInputWithUploaderId('1')}}" userInput="{{PageBuilderImageProperty_JPG.value}}" stepKey="attachImageFromLocalToStage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <!-- Validate Stage Mobile Viewport -->
         <actionGroup ref="ValidateBackgroundImageConfigurationActionGroup" stepKey="validateBackgroundImageStage">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSliderMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSliderMinHeightTest.xml
index 2a7bbf4f9d6..cabd1423788 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSliderMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSliderMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="ViewportSwitcherMobileSliderMinHeightTest" extends="ViewportSwitcherMobileRowMinHeightTest">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabGroupMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabGroupMinHeightTest.xml
index b6b1574de4e..a02ab037f1e 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabGroupMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabGroupMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabItemMinHeightTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabItemMinHeightTest.xml
index 44ecb82c660..e38512953c8 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabItemMinHeightTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabItemMinHeightTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabsThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabsThroughBlockContentTypeTest.xml
index 0a7feb515ff..ea1ba778f1d 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabsThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabsThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -24,6 +24,9 @@
             <createData entity="_emptyCmsPage" stepKey="createCMSPage"/>
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -38,7 +41,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
@@ -51,6 +54,9 @@
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="deleteMobileBackgroundImage">
                 <argument name="Image" value="PageBuilderBackgroundMobileImage_GIF"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Tabs -->
@@ -477,7 +483,7 @@
             <argument name="minHeight" value="{{PageBuilderTabsDefinedMinHeight.value}}"/>
             <argument name="index" value="2"/>
         </actionGroup>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
         <!-- Change Default Tab -->
         <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
             <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
index 99a747b7352..d789b037d88 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -27,6 +27,9 @@
             <createData entity="_emptyCmsBlock" stepKey="createCMSBlock"/>
             <createData entity="_defaultCmsPage" stepKey="createPreReqCMSPage"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="enableOldMediaGallery">
+                <argument name="enabled" value="0"/>
+            </actionGroup>
             <actionGroup ref="NavigateToCreatedCMSBlockPageActionGroup" stepKey="navigateToCreatedCMSBlockPage1">
                 <argument name="CMSBlockPage" value="$$createCMSBlock$$"/>
             </actionGroup>
@@ -41,7 +44,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
@@ -57,6 +60,9 @@
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
+            <actionGroup ref="CliMediaGalleryEnhancedEnableActionGroup" stepKey="disableOldMediaGallery">
+                <argument name="enabled" value="1"/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         <!-- Add Text -->
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileVideoThroughBlockContentTypeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileVideoThroughBlockContentTypeTest.xml
index e40f437ef56..622a192912b 100644
--- a/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileVideoThroughBlockContentTypeTest.xml
+++ b/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileVideoThroughBlockContentTypeTest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -38,7 +38,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/class-file-naming-allowlist b/app/code/Magento/PageBuilder/Test/Mftf/class-file-naming-allowlist
new file mode 100644
index 00000000000..96a350d1c14
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/class-file-naming-allowlist
@@ -0,0 +1,532 @@
+addPageBuilderPageTitle
+navigateToAPageWithPageBuilder
+navigateToCMSPage
+switchToPageBuilderStage
+verifyFullWidthLayout
+verifyPageBuilderNotVisibleOnPage
+verifyPageBuilderVisibleOnPage
+verifyPageBuilderVisibleOnStaging
+clearSlideOutPanelFieldMargins
+clearSlideOutPanelFieldMarginsAndPadding
+clearSlideOutPanelFieldPadding
+fillSlideOutPanelFieldMargins
+fillSlideOutPanelFieldMarginsAndPadding
+fillSlideOutPanelFieldPadding
+fillSlideOutPanelSingleFieldMarginsOrPadding
+seeInMarginFieldsSlideOutPanel
+seeInMarginsAndPaddingFieldSlideOutPanel
+seeInPaddingFieldsSlideOutPanel
+validateAdvancedConfigurationNotes
+validateAdvancedStyleWithAlignment
+validateAdvancedStyleWithAllUpdated
+validateAdvancedStyleWithAllUpdatedNotVisible
+validateAdvancedStyleWithBorderColor
+validateAdvancedStyleWithCssClasses
+validateAdvancedStyleWithNoAlignment
+validateAdvancedStyleWithNoAlignmentEmptyBorderRadius
+validateAdvancedStyleWithNoAlignmentNotVisible
+validateAdvancedStyleWithNoBorder
+validateAdvancedStyleWithNoBorderRadius
+validateAdvancedStyleWithNoBorderWidth
+validateAdvancedStyleWithNoConfiguration
+validateAdvancedStyleWithNoMargins
+validateAdvancedStyleWithNoPadding
+validateMarginsAndPaddingPlaceholderTextSlideOutPanel
+validateMarginsOrPaddingError
+validateTextAlignment
+validateBackgroundAttributes
+validateBackgroundAttributesWithNoColor
+validateBackgroundAttributesWithNoImage
+validateBackgroundAttributesWithNoImageOrColor
+validateBackgroundImage
+validateBackgroundImageContainer
+validateBackgroundMobileImage
+validateFallbackImageAfterVideoFinishesPlayingInVideoBackground
+validateFallbackImageInVideoBackgroundWithInvalidVideo
+validateInvalidVideoBackgroundAndNoFallbackImage
+validateMobileBackgroundAttributes
+validateMobileBackgroundAttributesWithNoImageOrColor
+validateNoBackgroundImage
+validateParallaxVideoBackgroundWithAllAttributes
+validateVideoAspectRatio
+validateVideoBackgroundFinishedPlaying
+validateVideoBackgroundFinishedPlayingBeforeViewing
+validateVideoBackgroundLoaded
+validateVideoBackgroundLoadedButNotPlaying
+validateVideoBackgroundLoadedButNotPlayingForNotVisibleElement
+validateVideoBackgroundNotLoaded
+validateVideoBackgroundPlaying
+validateVideoBackgroundWithAllAttributes
+validateVideoBackgroundWithOnlyVideoUrl
+expandAdminCategorySection
+openPageBuilderForAttribute
+saveCatalogCategory
+searchBlockInGrid
+verifyAlignmentRightInBlock
+verifyBlockOnStage
+verifyVerticalAlignmentBottomInBlock
+verifyVerticalAlignmentCenterInBlock
+inlineEditButton
+moveButton
+validateButtonGroupInlineAppearance
+validateButtonGroupInlineAppearanceWraps
+validateButtonGroupStackedAppearance
+validateButtonItemContent
+validateButtonItemsDefaultMargin
+validateButtonItemsDifferentSizes
+validateButtonItemsSameSize
+closeGridSizeForm
+dragColumnToAnotherColumnGroup
+dragColumnToColumnGroup
+dragExistingColumnToExistingColumnLine
+dragExistingColumnToNewColumnLine
+dragNewColumnToNewColumnLine
+openGridSizeForm
+updateGridSize
+updateGridSizeInvalid
+validateColumnAppearanceBottomAligned
+validateColumnAppearanceCenterAligned
+validateColumnAppearanceFullHeight
+validateColumnAppearanceTopAligned
+openGridSizeFormInColumnGroup
+updateGridSizeInForm
+updateGridSizeInvalidInForm
+validateDivider
+validateDividerWidthPercentage
+validateDividerWithoutColor
+validateDividerWithoutThickness
+validateDividerWithoutWidth
+clickInsideLiveEditHeading
+clickOutsideLiveEditHeading
+enterHeadingOnStage
+verifyHeadingAdvancedConfigurationWithAllUpdated
+verifyHeadingDefaultAdvancedConfiguration
+verifyHeadingDefaultAdvancedConfigurationNotVisible
+verifyHeadingInStage
+verifyHeadingInStageWithAlignment
+verifyHeadingInStorefront
+verifyHeadingInStorefrontWithAlignment
+addPageLinkWidgetToHtmlCodeWYSIWYGDisabled
+addTextToHtmlCodeWYSIWYGActionGroup
+addVariableToHtmlCodeWYSIWYGDisabled
+clickHtmlInsertImageButton
+removeTextFromHtmlCodeWYSIWYGActionGroup
+addImageToStage
+AdminAddImageCMSBlock
+validateImage
+verifyImageOnSlideout
+clickAddLocationButton
+clickEditButtonOnLocationGrid
+clickLocationGridRow
+clickMapToAddOrMovePin
+closeLocationForm
+closeMapPinTooltipWindow
+deleteLocationFromGrid
+dontSeeMapPin
+moveMapPinByDraggingAndDroppingPin
+openMapPinTooltipWindow
+saveLocationForm
+validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay
+validateAdvancedStyleWithNoAlignmentMapWithErrorOverlay
+validateEmptyMapStoreFront
+validateLocationGridData
+validateMapButtons
+validateMapErrorMessageAddLocationForm
+validateMapErrorMessageStage
+validateMapErrorMessageStorefront
+validateMapHeight
+validateMapHelperText
+validateMapPinLocationData
+validateMapSettings
+validateMapSettingsWithErrorOverlay
+validateNoMapButtons
+validateNoPinTooltip
+validateWarningMessageLink
+verifyCoordinatesNotEqual
+verifyMapHasPin
+verifyMapLatitudeAndLongitude
+verifyMapLatitudeAndLongitudeAlternate
+verifyNumberOfPinsOnMap
+verifyNumberOfPinsOnMapNoClick
+verifyPinLocationEqual
+verifyPinLocationNotEqual
+addConditionToProductConditions
+AddConditionsCombinationToProducts
+addConditionsCombinationToProductsAndSetAggregateParameters
+addSKUsToSelectProductsBySKU
+assertValueInConditionsFilter
+clickProductAddToCartInContinuousProductsCarouselOnStorefront
+clickProductAddToCartInProductsOnStorefront
+clickProductAddToCompareInContinuousProductsCarouselOnStorefront
+clickProductAddToCompareInProductsOnStorefront
+clickProductAddToWishListInContinuousProductsCarouselOnStorefront
+clickProductAddToWishListInProductsOnStorefront
+clickProductCarouselNavigationDot
+clickProductCarouselNextNavigationArrow
+clickProductCarouselPreviousNavigationArrow
+clickProductImageInContinuousProductsCarouselOnStorefront
+clickProductImageInProductsOnStorefront
+clickProductNameInContinuousProductsCarouselOnStorefront
+clickProductNameInProductsOnStorefront
+dragProductToSlideProductCarousel
+seeCategoriesInCategorySelector
+seeSKUsInSKUInputField
+selectCategoryFromCategoryDropDown
+validateCanSeeProductInContinuousProductCarousel
+validateCanSeeProductInDefaultProductCarousel
+validateCannotSeeProductInContinuousProductCarousel
+validateCannotSeeProductInDefaultProductCarousel
+validateEmptyProductsContainer
+validateProductCarouselNavigationArrowsAreNotRendered
+validateProductCarouselNavigationArrowsWorkWithInfiniteLoop
+validateProductCarouselNavigationDots
+validateProductCarouselNavigationDotsAreNotRendered
+validateProductCarouselNextNavigationArrowDisabled
+validateProductCarouselNextNavigationArrowEnabled
+validateProductCarouselPreviousNavigationArrowDisabled
+validateProductCarouselPreviousNavigationArrowEnabled
+validateProductCarouselSettingsAttributes
+validateProductCountInProducts
+validateProductCountInProductsCarousel
+validateProductInProducts
+validateProductOpacityInContinuousProductCarousel
+validateProductOpacityInDefaultProductCarousel
+validateProductTotals
+validateProductsDoNotWrapInCarouselAppearance
+validateProductsInProductCarouselAreCenteredForEvenNumberOfProducts
+validateProductsInProductCarouselAreCenteredForOddNumberOfProducts
+validateProductsWrapInGridAppearance
+validateSwatchInProducts
+validateBackgroundImageContainerForParallaxRow
+validateContainedRowAppearance
+validateFullBleedRowAppearance
+validateFullWidthRowAppearance
+validateRowBackgroundAttributesWithAllUpdatedAndParallaxEnabled
+validateRowParallaxBackgroundAttributes
+inlineEditSlideOrBannerButton
+inlineEditWYSIWYGFromStageForSlideCollageAppearancesInSmallColumns
+nextSlide
+switchSlide
+ValidateBackgroundAttributesForSlide
+validateBackgroundAttributesWithNoImageForSlide
+validateSliderAttributesActionGroup
+inlineEditTabItemName
+moveTabItem
+switchTabs
+validateTabHeadersAlignedCenter
+validateEmptyVideoStage
+validateVideo
+validateVideoEmptyWidth
+validateVideoNotAutoplaying
+validateVideoPlaying
+validateVideoWithOnlyVideoUrl
+validateVideoWithOnlyVideoUrlMp4
+cannotDragContentTypeToTarget
+cannotMoveContentTypeToContainer
+dragColumnGroupToExistingColumnGroup
+dragContentTypeNextToExistingContentType
+dragContentTypeToContainer
+dragContentTypeToContentType
+dragContentTypeToDropZone
+dragContentTypeToHiddenContainer
+dragContentTypeToStage
+dragContentTypeToStageByIndex
+moveContentTypeToContainer
+assertFieldSlideOutPropertyValueEquals
+chooseVisualSelectOption
+clearSlideOutPanelFieldGeneral
+clickSlideOutPanelFieldGeneral
+clickSlideOutPanelFieldOpenInNewTab
+closeEditPanelSettings
+conditionalClickSlideOutPanelFieldGeneral
+expandConfigurationSection
+fillOutUrlInput
+fillSlideOutPanelField
+fillSlideOutPanelFieldAndExpectToSeeErrorInFieldset
+fillSlideOutPanelFieldAndExpectToSeeErrorInFieldsetGeneral
+fillSlideOutPanelFieldGeneral
+fillSlideOutPanelLinkUrlField
+fillSlideOutPanelMultiSelectField
+fillSlideOutPanelTextArea
+saveEditPanelAndValidateFieldError
+saveEditPanelAndValidateFieldErrorGeneralSection
+saveEditPanelSettings
+saveEditPanelSettingsFullScreen
+scrollToSlideOutPanelField
+seeInFieldSlideOutIsZeroProperty
+seeInFieldSlideOutProperty
+seeInFieldSlideOutPropertyAlternate
+seeInFieldWithoutLabelSlideOutProperty
+seeInSlideOutMultiSelectField
+seeOptionIsCheckedSlideOutProperty
+seeOptionIsNotCheckedSlideOutProperty
+seeOptionIsSelectedSlideOutProperty
+seeSlideOutPanelFieldNotOpenInNewTab
+seeSlideOutPanelFieldOpenInNewTab
+selectSlideOutPanelField
+selectSlideOutPanelFieldGeneral
+validateAlignmentFieldIsNotDisabled
+validateSlideOutPanelField
+validateSlideOutPanelFieldAfterLabelText
+validateSlideOutPanelFieldHelperText
+validateSlideOutPanelFieldHelperTextWithUploaderId
+validateSlideOutPanelFieldIsDisabled
+validateSlideOutPanelFieldIsNotDisabled
+validateSlideOutPanelFieldIsNotRequired
+validateSlideOutPanelFieldIsRequired
+validateSlideOutPanelFieldNoAfterLabelText
+validateSlideOutPanelFieldNoPlaceholderText
+validateSlideOutPanelFieldNotPresent
+validateSlideOutPanelFieldPlaceholderText
+validateSlideOutPanelFieldTooltip
+validateSlideOutPanelFieldTooltipWithUploaderId
+validateSlideOutPanelFieldWithUploaderId
+validateSlideOutPanelLinkUrlField
+validateVerticalAlignmentVisualSelects
+validateVisualSelects
+fillOutColorPicker
+openAndValidateColorPickerValue
+pickColorSwatchCell
+seeColorInColorSwatch
+seeNoColorInColorSwatch
+attachFileSlideOutProperty
+attachFileSlideOutPropertyGeneral
+attachInvalidFileOnSlideOut
+clickSelectFromGallerySlideOut
+seeImageUploadedOnSlideOut
+seeNoImageUploadedOnSlideOut
+validateContentWidthEqualToContainerWidth
+validatePositionRightWithinContainer
+validateContentTypeHeightEqualToMinHeightPlusPaddingAndBorder
+validateContentTypeHeightGreaterThanMinHeight
+validateContentTypeWidthEqualToMaxWidth
+validateLayoutStylesNoHeight
+validateLayoutStylesWithAllUpdated
+addChildContentTypeFromOptionMenu
+closeConfirmModal
+confirmRemovalModal
+duplicateContentType
+duplicateSmallContentType
+hideContentType
+hideSmallContentType
+openOptionsMenu
+openPageBuilderEditPanel
+openPageBuilderEditPanelByIndex
+openPageBuilderEditPanelSmallByIndex
+openPageBuilderOptionsMenuSmallByIndex
+removeContentTypeFromStage
+removeContentTypeFromStageByIndex
+removeContentTypeFromStageSmallByIndex
+removeEmptyContentTypeFromStage
+showContentType
+showSmallContentType
+unFocusOptionMenu
+validateOnHoverNoOptionMenu
+validateOnHoverOptionMenu
+validateOverlayAndButtonCollage
+validateOverlayAndButtonPoster
+validateOverlayPositionBottom
+validateOverlayPositionCollageCenter
+validateOverlayPositionCollageLeft
+validateOverlayPositionCollageRight
+validateOverlayPositionPoster
+validateOverlayPositionTop
+closePageBuilderPanelMenuSections
+expandPageBuilderPanelMenuSection
+AddInvalidFileToStage
+exitPageBuilderFullScreen
+focusOnInlineTextAreaEditor
+focusOnInlineTinyMCEEditor
+goToEndOfLineTextAreaEditor
+goToEndOfLineTinyMCEEditor
+goToMediaStorageFromStage
+openPageBuilderFullScreen
+switchTabAndReloadPage
+uploadImageToContentTypeFromStage
+validateContentTypeHeightOnStage
+validateContentTypeHeightOnStageWithoutPadding
+validateContentTypeInsideContainerStage
+validateContentTypeNotInsideContainerStage
+verifyEmptyStage
+verifySelectFromGalleryButtonWorks
+verifyUploadImageButtons
+applyGoogleMapsAPIKey
+clickAndValidateGoogleMapsAPIKeyTestKeyButton
+disablePageBuilderSetting
+enablePageBuilderSetting
+inputGoogleMapsAPIKey
+inputGoogleMapsStyle
+updateDefaultGridSizeConfig
+updateMaxGridSizeConfig
+navigateToStoreFront
+navigateToStoreFrontWithStoreView
+validateContentTypeInsideContainerStorefront
+validateContentTypeInsideContainerStorefrontInDOM
+verifyCmsPageLinkOnFrontend
+choosePageBuilderTemplateCreatedForOptionsInFilter
+clearFiltersPageBuilderTemplateGrid
+clickApplyFromPageBuilderApplyTemplateSlideOut
+clickApplyPageBuilderTemplatesGridFilter
+clickCloseOnPageBuilderSaveTemplateConfirmationModal
+clickNextPageOnPageBuilderTemplateGrid
+clickOkOnPageBuilderSaveTemplateErrorModal
+clickPreviousPageOnPageBuilderTemplateGrid
+clickSaveOnPageBuilderSaveTemplateModal
+clickSaveOnPageBuilderSaveTemplateModalAndExpectErrorModal
+clickSaveOnPageBuilderSaveTemplateModalAndExpectNoChanges
+closePageBuilderApplyTemplateSlideOut
+closePageBuilderSaveTemplateModal
+closePageBuilderTemplatePreviewImageModal
+confirmApplyFromPageBuilderApplyTemplateSlideOut
+deletePageBuilderTemplate
+editPageBuilderTemplateGridTotalResultsPerPage
+fillPageBuilderSaveTemplateForm
+fillPageBuilderSaveTemplateFormWithSpaceForTemplateName
+filterPageBuilderTemplateGridByCreatedDate
+filterPageBuilderTemplateGridById
+filterPageBuilderTemplateGridByName
+navigateToPageBuilderTemplatesGridPage
+openPageBuilderApplyTemplateSlideOut
+openPageBuilderSaveTemplateModal
+openPageBuilderTemplatePreviewImageModal
+openPageBuilderTemplatesGridFilter
+savePageBuilderTemplate
+searchByKeywordPageBuilderTemplateGrid
+sortPageBuilderTemplateGridColumn
+validatePageBuilderSaveTemplateConfirmationModal
+validatePageBuilderSaveTemplateErrorModal
+validatePageBuilderSaveTemplateModal
+validatePageBuilderTemplateDataInGrid
+validatePageBuilderTemplateEmptyGrid
+validatePageBuilderTemplatePreviewImageModal
+validateTotalNumberOfRowsInPageBuilderTemplateGrid
+validateTotalRecordsFoundInPageBuilderTemplateGrid
+verifyCannotNavigateToPageBuilderTemplatesGridPage
+verifyNoPageBuilderDeleteTemplateButton
+verifyNoPageBuilderSaveOrApplyTemplateButtons
+addPageLinkVariableWYSIWYGDisabled
+addPageLinkWidgetToTinyMCE
+addPageLinkWidgetToTinyMCEInline
+addPageLinkWidgetWYSIWYGDisabled
+addTextToTinyMCE
+addTextToTinyMCEInline
+addTextToTinyMCEInlineWYSIWYGDisabled
+addVariableToTinyMCE
+addVariableToTinyMCEInline
+assertSelectedText
+assertTextareaContainsValue
+clickDirectiveTinyMCE
+clickInsertImageInTinyMCE
+clickMediaGalleryStorageRootArrow
+closeVariablePanelTinyMCE
+closeWidgetPanelTinyMCE
+doubleClickToInlineEditWYSIWYGFromStage
+doubleClickVariableTinyMCE
+doubleClickWidgetTinyMCE
+focusTinyMCE
+formatTextTinyMCE
+inlineEditTextAreaFromStage
+inlineEditWYSIWYGFromStage
+insertLinkInWYSIWYG
+insertLinkInWYSIWYGExistingText
+openInlineWYSIWYGEditorOnStage
+replaceTextToTinyMCE
+scrollToTinyMCE
+seeDirectiveFocusedTinyMCE
+seeVariableTinyMCE
+validateTextInTinyMCE
+verifyInlineTinyMCEEditorNotUnderOtherElements
+waitForTinyMCEInFocus
+clickOutsideTextInlineEditing
+BannerOnBackend
+BannerOnConfigurationPanel
+BannerOnFrontendEmptyLink
+BannerOnFrontend
+BlockOnForm
+BlockOnGrid
+BlockOnStage
+BlockOnStorefront
+ButtonGroupOnStage
+ButtonGroupOnStorefront
+ButtonItemOnStage
+ButtonItemOnStorefrontEmptyLink
+ButtonItemOnStorefront
+PageBuilderCategoryAttribute
+PageBuilderProductAttribute
+PageBuilderProductStorefront
+StorefrontProductFullWidth
+ColumnGroupOnFrontend
+ColumnLineOnBackend
+ColumnOnBackend
+ColumnOnFrontend
+PageBuilderDataGrid
+DividerOnStage
+DividerOnStorefront
+AdvancedForm
+ColorPicker
+EditPanelForm
+PageBuilderLinkAttributeAdmin
+VisualSelectComponent
+HeadingOnStage
+HeadingOnStorefront
+HtmlOnBackendArbitraryHtml
+HtmlOnBackendMediaDirective
+HtmlOnBackendNonexistentDataRole
+HtmlOnBackendWithImage
+HtmlOnConfiguration
+HtmlOnFrontendWithImage
+HtmlOnStage
+HtmlOnStorefront
+ImageOnConfigurationPanel
+ImageOnStage
+ImageOnStageWithoutImageUploaded
+ImageOnStorefront
+AddLocationForm
+EditMapForm
+MapOnStage
+MapOnStorefront
+CatalogProductsWidget
+ProductsCarouselOnStage
+ProductsContentTypeForm
+ProductsOnStage
+ProductsOnStorefront
+RowOnBackend
+RowOnStage
+RowOnStage_Contained
+RowOnStage_Contained_Invalid
+RowOnStorefront
+RowOnStorefront_FullWidth_FullBleed
+SlideOnBackend
+SlideOnConfigurationPanel
+SlideOnFrontendEmptyLink
+SlideOnFrontend
+SliderOnFrontend
+SliderOnStage
+PageBuilderContentTypeOptionsMenu
+PageBuilderPanel
+PageBuilderStage
+PageBuilderLinkAttributeStoreFront
+PageBuilderStoreFront
+TabOnStage
+TabOnStorefront
+TabsOnFrontend
+TabsOnStage
+PageBuilderApplyTemplateSlideOut
+PageBuilderApplyTemplatesGrid
+PageBuilderDeleteTemplateConfirmationModal
+PageBuilderPreviewImageModal
+PageBuilderSaveTemplateConfirmationModal
+PageBuilderSaveTemplateErrorModal
+PageBuilderSaveTemplateModal
+PageBuilderTemplatesPageGrid
+PageBuilderTemplatesPage
+TextOnConfiguration
+TextOnStage
+TextOnStorefront
+VideoOnStage
+VideoOnStorefront
+WYSIWYGInsertLinkModal
+WYSIWYGOnPageBuilderInline
+WYSIWYGOnPageBuilder
+validateMenuSectionsAndContentTypes
+PageBuilderWithWYSIWYG
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/test-dependency-allowlist b/app/code/Magento/PageBuilder/Test/Mftf/test-dependency-allowlist
new file mode 100644
index 00000000000..d609a9eefb3
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/test-dependency-allowlist
@@ -0,0 +1,17 @@
+AdminMediaGalleryFolderData
+ImageMetadata
+AdminOpenStandaloneMediaGalleryActionGroup
+AdminMediaGalleryFolderSelectActionGroup
+AdminMediaGalleryOpenNewFolderFormActionGroup
+AdminMediaGalleryCreateNewFolderActionGroup
+AdminEnhancedMediaGalleryUploadImageActionGroup
+AdminMediaGalleryFolderDeleteActionGroup
+AdminMediaGalleryClickImageInGridActionGroup
+AdminMediaGalleryClickAddSelectedActionGroup
+AdminEnhancedMediaGalleryViewImageDetails
+AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup
+CliMediaGalleryEnhancedEnableActionGroup
+BaseConfigurableProduct
+visualSwatchAttribute
+AddVisualSwatchToProductWithStorefrontConfigActionGroup
+AdminEnhancedMediaGalleryMassActionSection
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/test-dependency-errors-detailed b/app/code/Magento/PageBuilder/Test/Mftf/test-dependency-errors-detailed
new file mode 100644
index 00000000000..53c65a522e4
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Mftf/test-dependency-errors-detailed
@@ -0,0 +1,743 @@
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 AdminMediaGalleryFolderData from module(s): magento/module-media-gallery-ui
+	 ImageMetadata from module(s): magento/module-media-gallery-ui
+	 AdminOpenStandaloneMediaGalleryActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminMediaGalleryFolderSelectActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminMediaGalleryOpenNewFolderFormActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminMediaGalleryCreateNewFolderActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminEnhancedMediaGalleryUploadImageActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminMediaGalleryFolderDeleteActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminMediaGalleryClickImageInGridActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminMediaGalleryClickAddSelectedActionGroup from module(s): magento/module-media-gallery-ui
+	 AdminEnhancedMediaGalleryViewImageDetails from module(s): magento/module-media-gallery-ui
+	 AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryDirectivesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductDirectivesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentScrollTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageGIFTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileSizeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageInvalidFileTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageJPGTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImagePNGTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSpecialCharactersTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileSizeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageJPGTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImagePNGTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSpecialCharactersTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomCenterTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomLeftTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionBottomRightTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterLeftTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterRightTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionCenterTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopCenterTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopLeftTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundPositionTopRightTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatDisabledTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundRepeatEnabledTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeAutoTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeContainTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundSizeCoverTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterMobileWithoutMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageCenterAppearanceTest/BannerCollageCenterUpdateAllAttributesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftMobileWithoutMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageLeftAppearanceTest/BannerCollageLeftUpdateAllAttributesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightMobileWithoutMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightUpdateAllAttributesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCanOpenInNewTabTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerContentBlockDeleteImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerDoesNotNavigateOnStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerUploadImageWithSecretKeyEnabledTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundInfiniteLoopEnabled.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyCanSwitchBackgroundTypes.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsForEachAppearanceTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerVerifyStageUploadImageButtonsWorkWithVideoBackground.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/DuplicateBannerTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterMobileWithoutMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterUpdateAllAttributesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackground.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerPosterAppearanceTest/BannerPosterValidateVideoBackgroundFallbackImage.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderColumnFullHeightAppearanceThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithParallaxThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderRowContainedAppearanceWithVideoBackgroundThroughBlockContentType.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderLayoutContentTypesTest/BlockRenderTabsThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockImageIsRightAlignedTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerPosterAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderImageThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemPosterAppearanceWithVideoBackgroundThroughBlockContentType.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnBackgroundAttributeTest/ColumnValidateBackgroundFormTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupDuplicateAndHideTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGroupTest/ColumnGroupSettingsTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnChangesPreservedTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/ColumnSettingsAppearInAdminTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnTest/PreviewBackgroundImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateColumnWithImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateRowWithImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/DuplicateTabWithImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageIntoPageBuilderStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageCaptionDoesNotRenderHtmlTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageDuplicateTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageTestCMSPageOnTabletTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUpdateAdvancedConfigurationValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageUploadIsHiddenWhenDisabledTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageValidateAdvancedConfigurationDefaultValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageDefaultStateTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/ValidateShowHideOnImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderVerifySwatchDisplayedInPreviewGridTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 BaseConfigurableProduct from module(s): magento/module-configurable-product
+	 visualSwatchAttribute from module(s): magento/module-inventory-admin-ui, magento/module-swatches
+	 AddVisualSwatchToProductWithStorefrontConfigActionGroup from module(s): magento/module-swatches
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedValidateVideoBackground.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowContainedVideoBackgroundValidateFallbackImage.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateBackgroundFormTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundInfiniteLoopEnabled.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowBackgroundAttributeTest/RowVerifyCanSwitchBackgroundTypes.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowDuplicateTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderRowTest/RowWithParallaxEnabledStillShowsBackgroundImageAfterAddingColumnToItTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearanceCollageCenterTest/SlideCollageCenteredMobileWithoutMobileImageValuesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SlideItemPosterUpdateAllAttributesTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterValidateVideoBackground.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemAppearancePosterTest/SliderPosterVideoBackgroundValidateFallbackImage.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemContainedVerifyCanSwitchBackgroundTypes.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemDeleteImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemUploadImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundInfiniteLoopEnabled.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemValidateVideoBackgroundPlayOnlyWhenVisibleDisabled.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsForEachAppearanceTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemVerifyStageUploadImageButtonsWorkWithVideoBackground.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemBackgroundAttributeTest/TabItemValidateBackgroundFormTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifBottomAutoContainScrollFixedYesBackgroundRepeatAfterSaveTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundGifCenterAutoContainFixedNoBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgBottomCoverScrollFixedNoBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterAutoContainScrollFixedNoBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedNoBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgCenterCoverScrollFixedYesBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedNoBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundJpgTopCoverScrollFixedYesBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngBottomAutoContainScrollNoBackgroundRepeatAfterSaveTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemConfigurationTest/AddTabsWithBackgroundPngTopAutoContainScrollFixedYesBackgroundRepeatTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTabItemContentTest/CanAddImageToTabTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCETest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerPosterAppearanceThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileBannerUploadImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileColumnFullHeightAppearanceThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageContentUploadFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileImageThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemCollageLeftAppearanceWithVideoBackgroundThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemPosterAppearanceThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileSlideItemUploadImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTabsThroughBlockContentTypeTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCEWysiwygEnabledByDefaultTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CliMediaGalleryEnhancedEnableActionGroup from module(s): magento/module-media-gallery-ui
+
+File "/var/www/html/app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeImageActionGroup/AdminOpenSelectImageFromGalleryActionGroup.xml"
+contains entity references that violate dependency constraints:
+		
+	 AdminEnhancedMediaGalleryMassActionSection from module(s): magento/module-media-gallery-ui
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/ProductTotalsTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/ProductTotalsTest.php
new file mode 100644
index 00000000000..6bdb9f0a694
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/ProductTotalsTest.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model\Catalog;
+
+use Magento\Catalog\Api\CategoryRepositoryInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogWidget\Model\Rule;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Framework\DB\Select;
+use Magento\Framework\EntityManager\EntityMetadataInterface;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\PageBuilder\Model\Catalog\ProductTotals;
+use Magento\Rule\Model\Condition\Combine;
+use Magento\Rule\Model\Condition\Sql\Builder;
+use Magento\Widget\Helper\Conditions;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class ProductTotalsTest extends TestCase
+{
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private CollectionFactory $productCollectionFactory;
+
+    /**
+     * @var Builder|MockObject
+     */
+    private Builder $sqlBuilder;
+
+    /**
+     * @var Rule|MockObject
+     */
+    private Rule $rule;
+
+    /**
+     * @var Conditions|MockObject
+     */
+    private Conditions $conditionsHelper;
+
+    /**
+     * @var CategoryRepositoryInterface|MockObject
+     */
+    private CategoryRepositoryInterface $categoryRepository;
+
+    /**
+     * @var MetadataPool|MockObject
+     */
+    private MetadataPool $metadataPool;
+
+    /**
+     * @var ResourceConnection|MockObject
+     */
+    private ResourceConnection $resource;
+
+    /**
+     * @var ProductTotals|MockObject
+     */
+    private ProductTotals $productTotals;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->productCollectionFactory = $this->createMock(CollectionFactory::class);
+        $this->sqlBuilder = $this->createMock(Builder::class);
+        $this->rule = $this->createMock(Rule::class);
+        $this->conditionsHelper = $this->createMock(Conditions::class);
+        $this->categoryRepository = $this->createMock(CategoryRepositoryInterface::class);
+        $this->metadataPool = $this->createMock(MetadataPool::class);
+        $this->resource = $this->createMock(ResourceConnection::class);
+
+        $this->productTotals = new ProductTotals(
+            $this->productCollectionFactory,
+            $this->sqlBuilder,
+            $this->rule,
+            $this->conditionsHelper,
+            $this->categoryRepository,
+            $this->metadataPool,
+            $this->resource
+        );
+
+        parent::setUp();
+    }
+
+    /**
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Select_Exception
+     */
+    public function testGetProductTotals(): void
+    {
+        $collection = $this->createMock(Collection::class);
+        $collection->expects($this->exactly(3))->method('distinct');
+        $collection->expects($this->any())->method('addAttributeToFilter');
+        $collection->expects($this->exactly(3))->method('getAllIds');
+        $collection->expects($this->any())->method('getSize')->willReturn(1);
+        $select = $this->createMock(Select::class);
+        $select->expects($this->any())->method('joinLeft')->willReturn($select);
+
+        $collection->expects($this->exactly(3))->method('getSelect')->willReturn($select);
+        $this->productCollectionFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($collection);
+
+        $entityMeta = $this->createMock(EntityMetadataInterface::class);
+        $entityMeta->expects($this->exactly(3))->method('getLinkField')->willReturn('row_id');
+        $this->metadataPool->expects($this->exactly(3))
+            ->method('getMetadata')
+            ->with(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->willReturn($entityMeta);
+
+        $parentSelect = $this->createMock(Select::class);
+        $parentSelect->expects($this->any())->method('from')->willReturn($parentSelect);
+        $parentSelect->expects($this->any())->method('joinInner')->willReturn($parentSelect);
+        $db = $this->createMock(AdapterInterface::class);
+        $db->expects($this->exactly(3))->method('select')->willReturn($parentSelect);
+        $db->expects($this->exactly(3))->method('fetchCol')->willReturn([1]);
+        $this->resource->expects($this->exactly(3))->method('getConnection')->willReturn($db);
+
+        $this->conditionsHelper->expects($this->exactly(3))->method('decode')->willReturn([]);
+        $this->rule->expects($this->exactly(3))->method('loadPost');
+        $combine = $this->createMock(Combine::class);
+        $this->rule->expects($this->exactly(3))->method('getConditions')->willReturn($combine);
+
+        $this->productTotals->getProductTotals('{conditions}');
+    }
+}
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php
index c88f36cce98..981345affdc 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/Catalog/SortingTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/EditorConfigCacheCleanerTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/EditorConfigCacheCleanerTest.php
index f6b48032ce8..70046d77fd3 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Model/EditorConfigCacheCleanerTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/EditorConfigCacheCleanerTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php
index 41d4a7a4db0..d34008eb819 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/Filter/TemplateTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -61,7 +61,7 @@ public function testFilter(string $input, string $output): void
     /**
      * @return array
      */
-    public function filterProvider(): array
+    public static function filterProvider(): array
     {
         return [
             [
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/PreviewTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/PreviewTest.php
index ec1f162e33d..81d43e88f23 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Model/PreviewTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/PreviewTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php
index 61fb04da86c..8321c812881 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/Session/RandomKeyTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -84,7 +84,7 @@ function ($length) {
     /**
      * @return array[]
      */
-    public function getValueDataProvider(): array
+    public static function getValueDataProvider(): array
     {
         return [
             [
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Stage/HtmlFilterTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Stage/HtmlFilterTest.php
new file mode 100644
index 00000000000..4fd72e9cd9a
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/Stage/HtmlFilterTest.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model\Stage;
+
+use Magento\PageBuilder\Model\Stage\HtmlFilter;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
+
+class HtmlFilterTest extends TestCase
+{
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var HtmlFilter
+     */
+    private $htmlFilter;
+
+    protected function setUp(): void
+    {
+        $this->loggerMock = $this->createMock(LoggerInterface::class);
+        $this->htmlFilter = new HtmlFilter($this->loggerMock);
+    }
+
+    public function testFilterHtml()
+    {
+        //test for script tag
+        $inputHtml = '<div><script type="text/x-magento-init">alert("test")</script><p>Content</p></div>';
+        $expectedOutput = '<div><p>Content</p></div>';
+
+        $result = $this->htmlFilter->filterHtml($inputHtml);
+        $this->assertEquals($expectedOutput, $result);
+
+        //test for PB placeholder
+        $inputHtml = '
+<div data-content-type="html" data-appearance="default" data-element="main" class="test">
+<div class="block-123">Test</div>
+</div>';
+        $expectedOutput = '
+<div data-content-type="html" data-appearance="default" data-element="main" class="test placeholder-html-code">
+&lt;div class="block-123"&gt;Test&lt;/div&gt;
+</div>';
+
+        $result = $this->htmlFilter->filterHtml($inputHtml);
+        $this->assertEquals($expectedOutput, $result);
+    }
+}
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/TemplateRepositoryTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/TemplateRepositoryTest.php
new file mode 100644
index 00000000000..01e806d6bc8
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/TemplateRepositoryTest.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model;
+
+use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Exception\CouldNotDeleteException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\Image\Adapter\AdapterInterface;
+use Magento\Framework\Image\Factory;
+use Magento\PageBuilder\Api\Data\TemplateSearchResultsInterfaceFactory;
+use Magento\PageBuilder\Model\ResourceModel\Template as ResourceTemplate;
+use Magento\PageBuilder\Model\ResourceModel\Template\CollectionFactory;
+use Magento\PageBuilder\Model\Template;
+use Magento\PageBuilder\Model\TemplateFactory;
+use Magento\PageBuilder\Model\TemplateRepository;
+use Magento\MediaStorage\Helper\File\Storage\Database;
+use PHPUnit\Framework\MockObject\Exception;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
+class TemplateRepositoryTest extends TestCase
+{
+    /**
+     * @var ResourceTemplate|MockObject
+     */
+    private $resourceMock;
+
+    /**
+     * @var TemplateFactory|MockObject
+     */
+    private $templateFactoryMock;
+
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $templateCollectionFactoryMock;
+
+    /**
+     * @var TemplateSearchResultsInterfaceFactory|MockObject
+     */
+    private $searchResultsFactoryMock;
+
+    /**
+     * @var CollectionProcessorInterface|MockObject
+     */
+    private $collectionProcessorMock;
+
+    /**
+     * @var Filesystem|MockObject
+     */
+    private $filesystemMock;
+
+    /**
+     * @var Database|MockObject
+     */
+    private $mediaStorageMock;
+
+    /**
+     * @var Factory|MockObject
+     */
+    private $imageFactoryMock;
+
+    /**
+     * @var TemplateRepository
+     */
+    private $templateRepository;
+
+    protected function setUp(): void
+    {
+        $this->resourceMock = $this->createMock(ResourceTemplate::class);
+        $this->templateFactoryMock = $this->createMock(TemplateFactory::class);
+        $this->templateCollectionFactoryMock = $this->createMock(CollectionFactory::class);
+        $this->searchResultsFactoryMock = $this->createMock(TemplateSearchResultsInterfaceFactory::class);
+        $this->collectionProcessorMock = $this->createMock(CollectionProcessorInterface::class);
+        $this->filesystemMock = $this->createMock(Filesystem::class);
+        $this->mediaStorageMock = $this->createMock(Database::class);
+        $this->imageFactoryMock = $this->createMock(Factory::class);
+
+        $this->templateRepository = new TemplateRepository(
+            $this->resourceMock,
+            $this->templateFactoryMock,
+            $this->templateCollectionFactoryMock,
+            $this->searchResultsFactoryMock,
+            $this->collectionProcessorMock,
+            $this->filesystemMock,
+            $this->mediaStorageMock,
+            $this->imageFactoryMock
+        );
+    }
+
+    /**
+     * Test for delete method
+     *
+     * @return void
+     * @throws LocalizedException
+     * @throws Exception
+     */
+    public function testDelete()
+    {
+        $templateId = 1;
+        $templateMock =$this->getMockBuilder(Template::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getTemplateId'])
+            ->onlyMethods(['getPreviewImage', 'getPreviewThumbnailImage'])
+            ->getMock();
+        ;
+        $templateMock->expects($this->once())
+            ->method('getTemplateId')
+            ->willReturn($templateId);
+        $templateMock->expects($this->once())
+            ->method('getPreviewImage')
+            ->willReturn('preview_image.jpg');
+        $templateMock->expects($this->once())
+            ->method('getPreviewThumbnailImage')
+            ->willReturn('preview_thumb_image.jpg');
+
+        $this->templateFactoryMock->method('create')->willReturn($templateMock);
+        $this->resourceMock->expects($this->once())->method('load')->with($templateMock, $templateId);
+        $this->resourceMock->expects($this->once())->method('delete')->with($templateMock);
+
+        $mediaDirMock = $this->createMock(WriteInterface::class);
+        $this->filesystemMock->method('getDirectoryWrite')->willReturn($mediaDirMock);
+        $mediaDirMock->method('isExist')->willReturn(true);
+        $mediaDirMock->method('delete')->willReturn(true);
+        $this->imageFactoryMock->expects($this->exactly(2))
+            ->method('create')
+            ->willReturnCallback(
+                function ($path) {
+                    $this->assertEquals('preview_image.jpg', $path);
+                    return $this->createMock(AdapterInterface::class);
+                }
+            );
+        $this->mediaStorageMock->expects($this->exactly(2))->method('deleteFile');
+
+        $this->assertTrue($this->templateRepository->delete($templateMock));
+    }
+
+    /**
+     * Test for delete method when throws exception
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    public function testDeleteThrowsException()
+    {
+        $this->expectException(CouldNotDeleteException::class);
+
+        $templateMock =$this->getMockBuilder(Template::class)
+            ->disableOriginalConstructor()
+            ->addMethods(['getTemplateId'])
+            ->getMock();
+        $templateMock->expects($this->once())
+            ->method('getTemplateId')
+            ->willReturn(1);
+
+        $this->templateFactoryMock->method('create')->willReturn($templateMock);
+        $this->resourceMock->method('load')->willThrowException(new \Exception('Error'));
+
+        $this->templateRepository->delete($templateMock);
+    }
+}
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php
index 6017d7ed7a0..86ad03cd564 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/WidgetInitializerConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -35,7 +35,7 @@ public function testGetConfig(array $config, array $expectedConfig): void
     /**
      * @return array
      */
-    public function configProvider(): array
+    public static function configProvider(): array
     {
         return [
             [
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Model/Wysiwyg/DefaultConfigProviderTest.php b/app/code/Magento/PageBuilder/Test/Unit/Model/Wysiwyg/DefaultConfigProviderTest.php
new file mode 100644
index 00000000000..1ae95bcd7a9
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Test/Unit/Model/Wysiwyg/DefaultConfigProviderTest.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Test\Unit\Model\Wysiwyg;
+
+use Magento\PageBuilder\Model\Wysiwyg\DefaultConfigProvider;
+use Magento\Framework\DataObject;
+use Magento\Framework\View\Asset\Repository;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class DefaultConfigProviderTest extends TestCase
+{
+    /**
+     * @var Repository|MockObject
+     */
+    private Repository $assetRepo;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->assetRepo = $this->createMock(Repository::class);
+        parent::setUp();
+    }
+
+    /**
+     * @return void
+     */
+    public function testGetConfig(): void
+    {
+        $config = new DataObject();
+        $configProvider = new DefaultConfigProvider($this->assetRepo, []);
+        $result = $configProvider->getConfig($config);
+        $this->assertStringContainsString('fontfamily fontsizeinput', $result->getTinymce()['toolbar']);
+    }
+}
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php b/app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php
index 14a41195f96..c23631e1257 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Plugin/ClearEditorConfigCacheTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -73,7 +73,7 @@ public function testAfterLogin(bool $isUseSecretKey): void
     /**
      * @return array
      */
-    public function afterLoginDataProvider(): array
+    public static function afterLoginDataProvider(): array
     {
         return [
             [false],
diff --git a/app/code/Magento/PageBuilder/Test/Unit/Plugin/Filter/TemplatePluginTest.php b/app/code/Magento/PageBuilder/Test/Unit/Plugin/Filter/TemplatePluginTest.php
index f2206b1a9ac..ec649a5d1dc 100644
--- a/app/code/Magento/PageBuilder/Test/Unit/Plugin/Filter/TemplatePluginTest.php
+++ b/app/code/Magento/PageBuilder/Test/Unit/Plugin/Filter/TemplatePluginTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/BlockStatus.php b/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/BlockStatus.php
index 90102fd9135..24fedb8ac47 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/BlockStatus.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/BlockStatus.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -14,7 +14,7 @@
 class BlockStatus extends \Magento\Ui\Component\Listing\Columns\Column
 {
     /** Status column name used to get its column value */
-    const SOURCE_FIELD_NAME = 'is_active';
+    public const SOURCE_FIELD_NAME = 'is_active';
 
     /**
      * Prepare Data Source
diff --git a/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/PreviewImage.php b/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/PreviewImage.php
index 605c1c6d560..00b5ebc926e 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/PreviewImage.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/PreviewImage.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -18,9 +18,9 @@
  */
 class PreviewImage extends Column
 {
-    const NAME = 'preview_image';
+    public const NAME = 'preview_image';
 
-    const ALT_FIELD = 'name';
+    public const ALT_FIELD = 'name';
 
     /**
      * @var UrlInterface
diff --git a/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/TemplateManagerActions.php b/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/TemplateManagerActions.php
index 34201c08c8c..70e0e7ea7d3 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/TemplateManagerActions.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/Listing/Columns/TemplateManagerActions.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Ui/Component/Template/DataProvider.php b/app/code/Magento/PageBuilder/Ui/Component/Template/DataProvider.php
index 528108c58c5..a6fbd6e09ae 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/Template/DataProvider.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/Template/DataProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Ui/Component/Template/FulltextFilter.php b/app/code/Magento/PageBuilder/Ui/Component/Template/FulltextFilter.php
index 5825f0d6da8..ee23e0e352a 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/Template/FulltextFilter.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/Template/FulltextFilter.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page.php b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page.php
index ac555eae18c..a97acda6c70 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -25,7 +25,7 @@ public function __construct(\Magento\PageBuilder\Ui\Component\UrlInput\Page\Opti
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getConfig(): array
     {
diff --git a/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php
index 3ad5e856c89..6c7088f89f8 100644
--- a/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php
+++ b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Page/Options.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Url.php b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Url.php
new file mode 100644
index 00000000000..ee130fe643b
--- /dev/null
+++ b/app/code/Magento/PageBuilder/Ui/Component/UrlInput/Url.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Ui\Component\UrlInput;
+
+/** Provides configuration for url input link */
+class Url implements \Magento\Ui\Model\UrlInput\ConfigInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function getConfig(): array
+    {
+        return [
+            'label' => __('URL'),
+            'component' => 'Magento_Ui/js/form/element/abstract',
+            'template' => 'Magento_PageBuilder/form/element/input-no-maxlength',
+            'sortOrder' => 20
+        ];
+    }
+}
diff --git a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
index 506c8ac0a4a..4cf96cdab72 100644
--- a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
+++ b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -23,7 +23,7 @@ class WysiwygConfigDataProcessor implements
      * @param Config|null $config
      */
     public function __construct(
-        Config $config = null
+        ?Config $config = null
     ) {
         $this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
     }
diff --git a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/ProductCollection.php b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/ProductCollection.php
index 403a60bcd12..8ac2490ef36 100644
--- a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/ProductCollection.php
+++ b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/ProductCollection.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilder/ViewModel/StageRenderFrameRequireJsConfigModifier.php b/app/code/Magento/PageBuilder/ViewModel/StageRenderFrameRequireJsConfigModifier.php
new file mode 100644
index 00000000000..1ae244b0392
--- /dev/null
+++ b/app/code/Magento/PageBuilder/ViewModel/StageRenderFrameRequireJsConfigModifier.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\ViewModel;
+
+use Magento\Backend\ViewModel\RequireJsConfigModifierInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * Modifies requirejs configuration for the stage render frame
+ *
+ * Override the text! plugin within the iframe to ensure we can pipe any XHR requests through to the parent window
+ * as the same origin policy will not allow us to load the templates within this iframe.
+ * It is important that this mapping is configured before requirejs-config.js to ensure the text! plugin is overridden
+ * for all requests.
+ */
+class StageRenderFrameRequireJsConfigModifier implements ArgumentInterface, RequireJsConfigModifierInterface
+{
+    /**
+     * @inheritDoc
+     */
+    public function modify(array $config): array
+    {
+        $config['map']['*'] = array_merge(
+            $config['map']['*'] ?? [],
+            [
+                'text' => 'Magento_PageBuilder/js/master-format/render/requirejs/text',
+                'Magento_PageBuilder/js/events' => 'Magento_PageBuilder/js/master-format/render/events'
+            ]
+        );
+        return $config;
+    }
+}
diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json
index fa2a52cea04..0f2a99d7887 100644
--- a/app/code/Magento/PageBuilder/composer.json
+++ b/app/code/Magento/PageBuilder/composer.json
@@ -21,8 +21,8 @@
         "magento/module-wishlist": "*",
         "magento/module-require-js": "*",
         "magento/module-media-storage": "*",
-        "php": "~7.4.0||~8.1.0",
-        "phpgt/dom": "2.2.3"
+        "php": "~8.2.0||~8.3.0||~8.4.0",
+        "phpgt/dom": "^4.1"
     },
     "suggest": {
         "magento/module-review": "*"
diff --git a/app/code/Magento/PageBuilder/etc/acl.xml b/app/code/Magento/PageBuilder/etc/acl.xml
index 91353f062bf..a905d316870 100644
--- a/app/code/Magento/PageBuilder/etc/acl.xml
+++ b/app/code/Magento/PageBuilder/etc/acl.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/di.xml b/app/code/Magento/PageBuilder/etc/adminhtml/di.xml
index 27ba46bfe17..19af16939f6 100644
--- a/app/code/Magento/PageBuilder/etc/adminhtml/di.xml
+++ b/app/code/Magento/PageBuilder/etc/adminhtml/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -107,6 +107,7 @@
         <arguments>
             <argument name="linksConfiguration" xsi:type="array">
                 <item name="page" xsi:type="string">Magento\PageBuilder\Ui\Component\UrlInput\Page</item>
+                <item name="default" xsi:type="string">Magento\PageBuilder\Ui\Component\UrlInput\Url</item>
             </argument>
         </arguments>
     </type>
@@ -555,6 +556,10 @@
                     <item name="category" xsi:type="string">Category</item>
                     <item name="block" xsi:type="string">Block</item>
                 </item>
+                <item name="reserved_html_attributes" xsi:type="array">
+                    <item name="data-content-type" xsi:type="string">data-content-type</item>
+                    <item name="contenteditable" xsi:type="string">contenteditable</item>
+                </item>
             </argument>
             <argument name="rootContainerConfig" xsi:type="array">
                 <item name="label" xsi:type="string">Root Container</item>
@@ -582,14 +587,14 @@
     <type name="Magento\PageBuilder\Model\Wysiwyg\InlineEditingSupportedAdapterList">
         <arguments>
             <argument name="wysiwygAdaptersSupportingInlineEditing" xsi:type="array">
-                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="boolean">true</item>
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="boolean">true</item>
             </argument>
         </arguments>
     </type>
     <type name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
         <arguments>
             <argument name="editors" xsi:type="array">
-                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
                     <item name="component" xsi:type="string">Magento_PageBuilder/js/wysiwyg/tinymce</item>
                     <item name="component_initializers" xsi:type="array">
                         <item name="text" xsi:type="string">Magento_PageBuilder/js/content-type/text/wysiwyg/tinymce/component-initializer</item>
@@ -613,7 +618,7 @@
     <virtualType name="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\BannerConfig" type="Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Provider\Wysiwyg\Config">
         <arguments>
             <argument name="editors" xsi:type="array">
-                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymce5Adapter" xsi:type="array">
+                <item name="mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter" xsi:type="array">
                     <item name="parentSelectorsToUnderlay" xsi:type="null"/>
                 </item>
             </argument>
@@ -629,6 +634,7 @@
             <argument name="overrideSnapshot" xsi:type="boolean">true</argument>
         </arguments>
     </virtualType>
+    <preference for="Magento\Catalog\Ui\Component\Category\Form\Element\Wysiwyg" type="Magento\PageBuilder\Component\Form\Element\CategoryWysiwyg" />
     <type name="Magento\PageBuilder\Ui\Component\Template\DataProvider">
         <arguments>
             <argument name="additionalFilterPool" xsi:type="array">
@@ -636,9 +642,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
     <type name="Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Eav">
         <plugin name="pagebuilder_product_form_eav" type="Magento\PageBuilder\Plugin\Catalog\Ui\DataProvider\Product\Form\Modifier\EavPlugin" sortOrder="20"/>
     </type>
@@ -646,4 +649,7 @@
         <plugin name="pagebuilder_clear_editor_config_cache"
                 type="Magento\PageBuilder\Plugin\ClearEditorConfigCache" sortOrder="10"/>
     </type>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" sortOrder="1"/>
+    </type>
 </config>
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/events.xml b/app/code/Magento/PageBuilder/etc/adminhtml/events.xml
index f44352a616a..336a8e37dce 100644
--- a/app/code/Magento/PageBuilder/etc/adminhtml/events.xml
+++ b/app/code/Magento/PageBuilder/etc/adminhtml/events.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/menu.xml b/app/code/Magento/PageBuilder/etc/adminhtml/menu.xml
index 1a5effaed5a..465a51dfd41 100644
--- a/app/code/Magento/PageBuilder/etc/adminhtml/menu.xml
+++ b/app/code/Magento/PageBuilder/etc/adminhtml/menu.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Backend:etc/menu.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/routes.xml b/app/code/Magento/PageBuilder/etc/adminhtml/routes.xml
index 6a63959b3e2..5ef6258f962 100644
--- a/app/code/Magento/PageBuilder/etc/adminhtml/routes.xml
+++ b/app/code/Magento/PageBuilder/etc/adminhtml/routes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/adminhtml/system.xml b/app/code/Magento/PageBuilder/etc/adminhtml/system.xml
index 3faa848414d..f5e845e67be 100644
--- a/app/code/Magento/PageBuilder/etc/adminhtml/system.xml
+++ b/app/code/Magento/PageBuilder/etc/adminhtml/system.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/config.xml b/app/code/Magento/PageBuilder/etc/config.xml
index 1b063e58a4a..9e9613d9f53 100644
--- a/app/code/Magento/PageBuilder/etc/config.xml
+++ b/app/code/Magento/PageBuilder/etc/config.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <general>
             <validator_data>
@@ -38,5 +39,10 @@
                 </allowed_resources>
             </media_storage_configuration>
         </system>
+        <catalog>
+            <fields_masks>
+                <meta_description>{{name}}</meta_description>
+            </fields_masks>
+        </catalog>
     </default>
 </config>
diff --git a/app/code/Magento/PageBuilder/etc/content_type.xsd b/app/code/Magento/PageBuilder/etc/content_type.xsd
index d48a8260080..e4aba5e1921 100644
--- a/app/code/Magento/PageBuilder/etc/content_type.xsd
+++ b/app/code/Magento/PageBuilder/etc/content_type.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/app/code/Magento/PageBuilder/etc/content_type_merged.xsd b/app/code/Magento/PageBuilder/etc/content_type_merged.xsd
index 4a89382cbfd..e9c7cab5f76 100644
--- a/app/code/Magento/PageBuilder/etc/content_type_merged.xsd
+++ b/app/code/Magento/PageBuilder/etc/content_type_merged.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/app/code/Magento/PageBuilder/etc/crontab/di.xml b/app/code/Magento/PageBuilder/etc/crontab/di.xml
deleted file mode 100644
index 5be69b2dce3..00000000000
--- a/app/code/Magento/PageBuilder/etc/crontab/di.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
-</config>
diff --git a/app/code/Magento/PageBuilder/etc/csp_whitelist.xml b/app/code/Magento/PageBuilder/etc/csp_whitelist.xml
new file mode 100644
index 00000000000..ccc8eb56e02
--- /dev/null
+++ b/app/code/Magento/PageBuilder/etc/csp_whitelist.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
+    <policies>
+        <policy id="connect-src">
+            <values>
+                <value id="vimeo" type="host">vimeo.com</value>
+            </values>
+        </policy>
+        <policy id="frame-src">
+            <values>
+                <value id="youtube" type="host">*.youtube.com</value>
+                <value id="youtube_nocookie" type="host">*.youtube-nocookie.com</value>
+            </values>
+        </policy>
+    </policies>
+</csp_whitelist>
diff --git a/app/code/Magento/PageBuilder/etc/db_schema.xml b/app/code/Magento/PageBuilder/etc/db_schema.xml
index 732130cf045..7bb0be73702 100644
--- a/app/code/Magento/PageBuilder/etc/db_schema.xml
+++ b/app/code/Magento/PageBuilder/etc/db_schema.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilder/etc/di.xml b/app/code/Magento/PageBuilder/etc/di.xml
index 54f6f9885de..026b231b2b1 100644
--- a/app/code/Magento/PageBuilder/etc/di.xml
+++ b/app/code/Magento/PageBuilder/etc/di.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Ui\Component\Form\Element\Wysiwyg" type="Magento\PageBuilder\Component\Form\Element\Wysiwyg" />
-    <preference for="Magento\Catalog\Ui\Component\Category\Form\Element\Wysiwyg" type="Magento\PageBuilder\Component\Form\Element\CategoryWysiwyg" />
     <preference for="Magento\Framework\Data\Form\Element\Editor" type="Magento\PageBuilder\Block\Element\Editor" />
     <preference for="Magento\PageBuilder\Model\ConfigInterface" type="Magento\PageBuilder\Model\Config" />
     <preference for="Magento\PageBuilder\Model\Dom\Adapter\AttrInterface" type="Magento\PageBuilder\Model\Dom\Attr" />
@@ -184,7 +183,6 @@
         <arguments>
             <argument name="productCollectionFactory" xsi:type="object">pageBuilderProductCollectionFactory</argument>
         </arguments>
-        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" />
     </type>
     <type name="Magento\Catalog\Helper\Output">
         <arguments>
@@ -316,6 +314,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Filter\Template">
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+    </type>
     <type name="Magento\PageBuilder\Model\UpgradableEntitiesPool">
         <arguments>
             <argument name="entities" xsi:type="array">
@@ -361,6 +362,7 @@
         <arguments>
             <argument name="allowedHosts" xsi:type="array">
                 <item name="youtube" xsi:type="string">youtube.com</item>
+                <item name="youtube-nocookie" xsi:type="string">youtube-nocookie.com</item>
                 <item name="vimeo" xsi:type="string">vimeo.com</item>
             </argument>
         </arguments>
@@ -414,6 +416,7 @@
                 <item name="data-video-overlay-color" xsi:type="string">data-video-overlay-color</item>
                 <item name="data-video-play-only-visible" xsi:type="string">data-video-play-only-visible</item>
                 <item name="data-video-src" xsi:type="string">data-video-src</item>
+                <item name="data-placeholder" xsi:type="string">data-placeholder</item>
                 <item name="href" xsi:type="string">href</item>
                 <item name="id" xsi:type="string">id</item>
                 <item name="role" xsi:type="string">role</item>
diff --git a/app/code/Magento/PageBuilder/etc/extension_attributes.xml b/app/code/Magento/PageBuilder/etc/extension_attributes.xml
index f896642b380..ebdad730cf8 100644
--- a/app/code/Magento/PageBuilder/etc/extension_attributes.xml
+++ b/app/code/Magento/PageBuilder/etc/extension_attributes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Api/etc/extension_attributes.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/frontend/di.xml b/app/code/Magento/PageBuilder/etc/frontend/di.xml
index 1e11ac72324..2623e05a16f 100644
--- a/app/code/Magento/PageBuilder/etc/frontend/di.xml
+++ b/app/code/Magento/PageBuilder/etc/frontend/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -12,7 +12,7 @@
     <type name="Magento\Email\Model\Template\Filter">
         <plugin name="escapeCustomVarDirectives" type="Magento\PageBuilder\Plugin\Filter\CustomVarTemplate"/>
     </type>
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" sortOrder="1"/>
     </type>
 </config>
diff --git a/app/code/Magento/PageBuilder/etc/frontend/routes.xml b/app/code/Magento/PageBuilder/etc/frontend/routes.xml
index 4d6596d1dad..5718a8dc52a 100644
--- a/app/code/Magento/PageBuilder/etc/frontend/routes.xml
+++ b/app/code/Magento/PageBuilder/etc/frontend/routes.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/webapi_soap/di.xml b/app/code/Magento/PageBuilder/etc/graphql/di.xml
similarity index 50%
rename from app/code/Magento/PageBuilder/etc/webapi_soap/di.xml
rename to app/code/Magento/PageBuilder/etc/graphql/di.xml
index 5be69b2dce3..29f1a368c49 100644
--- a/app/code/Magento/PageBuilder/etc/webapi_soap/di.xml
+++ b/app/code/Magento/PageBuilder/etc/graphql/di.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
+        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin" disabled="true"/>
+    </type>
+    <type name="Magento\CatalogWidget\Block\Product\ProductsList">
+        <plugin name="pagebuilder_product_list" type="Magento\PageBuilder\Plugin\Catalog\Block\Product\ProductsListPlugin" sortOrder="1"/>
     </type>
 </config>
diff --git a/app/code/Magento/PageBuilder/etc/menu_section.xsd b/app/code/Magento/PageBuilder/etc/menu_section.xsd
index 8626371c25a..f10aaa332c1 100644
--- a/app/code/Magento/PageBuilder/etc/menu_section.xsd
+++ b/app/code/Magento/PageBuilder/etc/menu_section.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/app/code/Magento/PageBuilder/etc/menu_section_merged.xsd b/app/code/Magento/PageBuilder/etc/menu_section_merged.xsd
index 9d469c59211..1e589ea3b85 100644
--- a/app/code/Magento/PageBuilder/etc/menu_section_merged.xsd
+++ b/app/code/Magento/PageBuilder/etc/menu_section_merged.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/app/code/Magento/PageBuilder/etc/module.xml b/app/code/Magento/PageBuilder/etc/module.xml
index ab0506bd754..34b462b32e2 100644
--- a/app/code/Magento/PageBuilder/etc/module.xml
+++ b/app/code/Magento/PageBuilder/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
diff --git a/app/code/Magento/PageBuilder/etc/view.xml b/app/code/Magento/PageBuilder/etc/view.xml
index 4e4052bcbb5..0eac0c02eac 100644
--- a/app/code/Magento/PageBuilder/etc/view.xml
+++ b/app/code/Magento/PageBuilder/etc/view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <view xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Config/etc/view.xsd">
@@ -62,9 +62,9 @@
                 <var name="stage">true</var>
                 <var name="class">mobile-switcher</var>
                 <var name="icon">Magento_PageBuilder::css/images/switcher/switcher-mobile.svg</var>
-                <var name="media">only screen and (max-width: 768px)</var>
+                <var name="media">only screen and (max-width: 767px)</var>
                 <var name="conditions">
-                    <var name="max-width">768px</var>
+                    <var name="max-width">767px</var>
                     <var name="min-width">640px</var>
                 </var>
                 <var name="options">
diff --git a/app/code/Magento/PageBuilder/etc/webapi_rest/di.xml b/app/code/Magento/PageBuilder/etc/webapi_rest/di.xml
deleted file mode 100644
index 5be69b2dce3..00000000000
--- a/app/code/Magento/PageBuilder/etc/webapi_rest/di.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\Filter\Template">
-        <plugin name="convertBackgroundImages" type="Magento\PageBuilder\Plugin\Filter\TemplatePlugin"/>
-    </type>
-</config>
diff --git a/app/code/Magento/PageBuilder/i18n/en_US.csv b/app/code/Magento/PageBuilder/i18n/en_US.csv
index 1a910d2a055..12e044a7a81 100644
--- a/app/code/Magento/PageBuilder/i18n/en_US.csv
+++ b/app/code/Magento/PageBuilder/i18n/en_US.csv
@@ -322,3 +322,6 @@ OK,OK
 "There is no content able to be saved within Page Builder.","There is no content able to be saved within Page Builder."
 "Save Content as Template","Save Content as Template"
 "Template Name","Template Name"
+"Could not delete the Template: %1","Could not delete the Template: %1"
+"Forbidden. You do not have permission to perform this action.","Forbidden. You do not have permission to perform this action."
+"Permission Error","Permission Error"
diff --git a/app/code/Magento/PageBuilder/registration.php b/app/code/Magento/PageBuilder/registration.php
index ae9fc0c1af8..d1afed10e13 100644
--- a/app/code/Magento/PageBuilder/registration.php
+++ b/app/code/Magento/PageBuilder/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 use \Magento\Framework\Component\ComponentRegistrar;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml
index 6a95e8e87fa..917ae0acf75 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+ /**
+  * Copyright 2019 Adobe
+  * All Rights Reserved.
+  */
 -->
-<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column"
+      xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <remove src="extjs/resources/css/ext-all.css"/>
         <remove src="extjs/resources/css/ytheme-magento.css"/>
@@ -14,11 +15,21 @@
         <remove src="css/styles.css"/>
     </head>
     <body>
+        <referenceBlock name="require.js">
+            <arguments>
+                <argument name="config_modifier" xsi:type="object">
+                    Magento\PageBuilder\ViewModel\StageRenderFrameRequireJsConfigModifier
+                </argument>
+            </arguments>
+        </referenceBlock>
         <referenceContainer name="backend.page" remove="true"/>
         <referenceContainer name="menu.wrapper" remove="true"/>
         <referenceContainer name="root">
-            <block name="stage_render" class="Magento\PageBuilder\Block\Adminhtml\Stage\Render" template="Magento_PageBuilder::stage/render.phtml" />
-            <block name="pagebuilder.babel.polyfill" class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill" template="Magento_PageBuilder::html/head/babel_polyfill.phtml" />
+            <block name="stage_render" class="Magento\PageBuilder\Block\Adminhtml\Stage\Render"
+                   template="Magento_PageBuilder::stage/render.phtml" />
+            <block name="pagebuilder.babel.polyfill"
+                   class="Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill"
+                   template="Magento_PageBuilder::html/head/babel_polyfill.phtml" />
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
         </referenceContainer>
     </body>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column-line.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column-line.xml
new file mode 100644
index 00000000000..a8edfb5c189
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column-line.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
+    <type name="column-line"
+          label="Column Line"
+          component="Magento_PageBuilder/js/content-type-collection"
+          preview_component="Magento_PageBuilder/js/content-type/column-line/preview"
+          master_component="Magento_PageBuilder/js/content-type/master-collection"
+          sortOrder="10"
+          translate="label">
+        <parents default_policy="deny">
+            <parent name="column-group" policy="allow"/>
+        </parents>
+        <children default_policy="deny">
+            <child name="column" policy="allow"/>
+        </children>
+        <is_system>false</is_system>
+        <appearances>
+            <appearance default="true"
+                        name="default"
+                        preview_template="Magento_PageBuilder/content-type/column-line/default/preview"
+                        master_template="Magento_PageBuilder/content-type/column-line/default/master"
+                        reader="Magento_PageBuilder/js/master-format/read/configurable">
+                <elements>
+                    <element name="main">
+                        <attribute name="name" source="data-content-type"/>
+                        <attribute name="appearance" source="data-appearance"/>
+                        <attribute name="grid_size" source="data-grid-size"/>
+                        <static_style source="display" value="flex"/>
+                        <static_style source="width" value="100%"/>
+                    </element>
+                </elements>
+            </appearance>
+        </appearances>
+    </type>
+</config>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column.xml
index a7eba0892ed..17f43d95915 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column.xml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column.xml
@@ -22,11 +22,13 @@
             </breakpoint>
         </breakpoints>
         <parents default_policy="deny">
-            <parent name="column-group" policy="allow"/>
+            <parent name="column-line" policy="allow"/>
+            <parent name="column" policy="allow"/>
         </parents>
         <children default_policy="allow">
             <child name="row" policy="deny"/>
             <child name="column" policy="deny"/>
+            <child name="column-line" policy="deny"/>
         </children>
         <is_system>false</is_system>
         <appearances>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml
index 8e4f2d932c2..886e47c5d6f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/column_group.xml
@@ -23,6 +23,7 @@
             <parent name="tab-item" policy="allow"/>
         </parents>
         <children default_policy="deny">
+            <child name="column-line" policy="allow"/>
             <child name="column" policy="allow"/>
         </children>
         <appearances>
@@ -62,7 +63,6 @@
                     </css>
                     </element>
                     <element name="container">
-                        <static_style source="display" value="flex"/>
                     </element>
                 </elements>
                 <converters>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/video.xml b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/video.xml
index f804ed5d3ad..13ce50279b0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/video.xml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/pagebuilder/content_type/video.xml
@@ -46,6 +46,7 @@
                         <attribute name="video_source" source="src" converter="Magento_PageBuilder/js/content-type/video/converter/attribute/videosrc" preview_converter="Magento_PageBuilder/js/content-type/video/converter/attribute/videosrc"/>
                         <attribute name="autoplay" storage_key="autoplay" source="autoplay" converter="Magento_PageBuilder/js/content-type/video/converter/attribute/autoplay"/>
                         <attribute name="muted_video" storage_key="autoplay" source="muted" converter="Magento_PageBuilder/js/content-type/video/converter/attribute/autoplay"/>
+                        <attribute name="playsinline_video" storage_key="autoplay" source="playsinline" converter="Magento_PageBuilder/js/content-type/video/converter/attribute/autoplay"/>
                     </element>
                 </elements>
             </appearance>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js b/app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js
index f7a5d86cf04..b764530aa69 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/requirejs-config.js
@@ -41,6 +41,9 @@ var config = {
             },
             'Magento_PageBuilder/js/content-type/row/appearance/default/widget': {
                 'Magento_PageBuilder/js/content-type/row/appearance/default/widget-mixin': true
+            },
+            'Magento_Ui/js/form/element/file-uploader': {
+                'Magento_PageBuilder/js/form/element/file-uploader': true
             }
         }
     }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml
index 4c6617fe0e0..42c979b5457 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml
@@ -1,26 +1,27 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
-?>
-<?php
+
 /** @var $block \Magento\PageBuilder\Block\Adminhtml\Form\Element\ProductConditions */
+/** @var $escaper \Magento\Framework\Escaper */
+
 $attribute = $block->getData('attribute');
 $id = $block->getData('formNamespace') . '_' . $attribute;
 $role = 'pagebuilder-conditions-form-placeholder-' . $attribute;
 ?>
 <label class="admin__field-label">
-    <span><?= $block->escapeHtml($block->getData('label')) ?></span>
+    <span><?= $escaper->escapeHtml($block->getData('label')) ?></span>
 </label>
 <div class="admin__field-control">
     <div class="rule-tree">
-        <fieldset id="<?= $block->escapeHtmlAttr($id) ?>" class="fieldset">
+        <fieldset id="<?= $escaper->escapeHtmlAttr($id) ?>" class="fieldset">
             <div class="rule-tree-wrapper">
-                <div data-role="<?= $block->escapeHtmlAttr($role) ?>"></div>
+                <div data-role="<?= $escaper->escapeHtmlAttr($role) ?>"></div>
             </div>
         </fieldset>
     </div>
 </div>
 
-<script type="text/x-magento-init"><?= /* @noEscape */ $block->getConfigJson() ?></script>
\ No newline at end of file
+<script type="text/x-magento-init"><?= /* @noEscape */ $block->getConfigJson() ?></script>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/html/container.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/html/container.phtml
index bad5acc209b..b6afc3933d8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/html/container.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/html/container.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 // @codingStandardsIgnoreFile
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/html/head/babel_polyfill.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/html/head/babel_polyfill.phtml
index 13f55f86203..1beca4f87e8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/html/head/babel_polyfill.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/html/head/babel_polyfill.phtml
@@ -1,12 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /* @var $block \Magento\PageBuilder\Block\Adminhtml\Html\Head\BabelPolyfill */
+/** @var $escaper \Magento\Framework\Escaper */
 
-if ($block->shouldLoadPolyfill()) : ?>
-<script src="<?= $block->escapeUrl($block->getJsUrl()) ?>"></script>
+if ($block->shouldLoadPolyfill()): ?>
+<script src="<?= $escaper->escapeUrl($block->getJsUrl()) ?>"></script>
 <?php endif; ?>
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml
index cd3c853b211..81754a8f319 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml
@@ -1,35 +1,25 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
-/** @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block */
+/**
+ * @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 ?>
-<script>
-    <?php
-    /**
-     * Override the text! plugin within the iframe to ensure we can pipe any XHR requests through to the parent window
-     * as the same origin policy will not allow us to load the templates within this iframe.
-     */
-    ?>
-    require.config({
-        'map': {
-            '*': {
-                'text': 'Magento_PageBuilder/js/master-format/render/requirejs/text',
-                'Magento_PageBuilder/js/events': 'Magento_PageBuilder/js/master-format/render/events'
-            }
-        }
-    });
 
-    <?php
-    /**
-     * To be able to override the text plugin we need the Magento template engine to be used, as the template engine
-     * within lib has a dependency on the text! plugin we need to ensure we set the template engine before the
-     * dependency blocks us. If we try to just override using the RequireJS config above our !text plugin will never
-     * get overridden as our template engine cannot load.
-     */
-    ?>
+<?php
+$pageBuilderConfig = $block->getPageBuilderConfig();
+
+/**
+ * To be able to override the text plugin we need the Magento template engine to be used, as the template engine
+ * within lib has a dependency on the text! plugin we need to ensure we set the template engine before the
+ * dependency blocks us. If we try to just override using the RequireJS config above our !text plugin will never
+ * get overridden as our template engine cannot load.
+ */
+$script = <<<SCRIPT
     require([
         'ko',
         'Magento_Ui/js/lib/knockout/template/engine'
@@ -39,10 +29,11 @@
         ko.uid = 0;
         ko.setTemplateEngine(templateEngine);
     });
-</script>
-<script>
+
     require(['Magento_PageBuilder/js/master-format/render/frame'], function (listen) {
-        listen(<?= /* @noEscape */ $block->getPageBuilderConfig(); ?>);
+        listen({$pageBuilderConfig});
     });
-</script>
+SCRIPT;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false) ?>
 <div>Page Builder Render Frame</div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/enable_field/modal_content_body.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/enable_field/modal_content_body.phtml
index a82e449ed0b..483ca708bce 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/enable_field/modal_content_body.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/enable_field/modal_content_body.phtml
@@ -1,22 +1,23 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
+/** @var $escaper \Magento\Framework\Escaper */
 ?>
 <div class="pagebuilder-modal-content-body">
-    <p><?= $block->escapeHtml(__('This will change your Admin and storefront by:')) ?></p>
+    <p><?= $escaper->escapeHtml(__('This will change your Admin and storefront by:')) ?></p>
     <ul>
         <li>
-            <strong><?= $block->escapeHtml(__('Removing PageBuilder\'s advanced content tools')) ?></strong>
-            <?= $block->escapeHtml(
+            <strong><?= $escaper->escapeHtml(__('Removing PageBuilder\'s advanced content tools')) ?></strong>
+            <?= $escaper->escapeHtml(
                 __('from their assigned text fields and adding a basic text editor as replacement.')
             ) ?>
         </li>
         <li>
-            <strong><?= $block->escapeHtml(__('Potentially creating display errors on your storefront')) ?></strong>
-            <?= $block->escapeHtml(
+            <strong><?= $escaper->escapeHtml(__('Potentially creating display errors on your storefront')) ?></strong>
+            <?= $escaper->escapeHtml(
                 __(', due to content reformatting. Also, some content may no longer be editable from within the Admin.')
             ) ?>
         </li>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_key.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_key.phtml
index fed006b741b..b0c6a416e5d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_key.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/google_maps_api_key.phtml
@@ -1,25 +1,26 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
  * @var \Magento\PageBuilder\Block\Adminhtml\System\Config\Form\Field\GoogleMapsApiKey $block
+ * @var $escaper \Magento\Framework\Escaper
  */
 ?>
 <button class="scalable"
         type="button"
-        id="<?= $block->escapeHtmlAttr($block->getHtmlId()) ?>"
+        id="<?= $escaper->escapeHtmlAttr($block->getHtmlId()) ?>"
         data-mage-init='{
             "Magento_PageBuilder/js/system/config/google-maps-api-key-validator": {
-                "elementId": "<?= $block->escapeJs($block->getHtmlId()) ?>",
-                "validateUrl": "<?= $block->escapeJs($block->getValidateUrl()) ?>",
-                "buttonLabel": "<?= $block->escapeJs($block->getButtonLabel()) ?>",
-                "validLabel": "<?= $block->escapeJs($block->getValidLabel()) ?>",
-                "invalidLabel": "<?= $block->escapeJs($block->getInvalidLabel()) ?>",
-                "sourceField": "<?= $block->escapeJs($block->getSourceField()) ?>"
+                "elementId": "<?= $escaper->escapeJs($block->getHtmlId()) ?>",
+                "validateUrl": "<?= $escaper->escapeJs($block->getValidateUrl()) ?>",
+                "buttonLabel": "<?= $escaper->escapeJs($block->getButtonLabel()) ?>",
+                "validLabel": "<?= $escaper->escapeJs($block->getValidLabel()) ?>",
+                "invalidLabel": "<?= $escaper->escapeJs($block->getInvalidLabel()) ?>",
+                "sourceField": "<?= $escaper->escapeJs($block->getSourceField()) ?>"
             }
         }'
         disabled="disabled"
-><span class="result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></button>
+><span class="result"><?= $escaper->escapeHtml($block->getButtonLabel()) ?></span></button>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/switch_attribute_type.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/switch_attribute_type.phtml
index f8b8c9e843b..a46e90afb30 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/switch_attribute_type.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/system/config/switch_attribute_type.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/templates/wysiwyg_setup.phtml b/app/code/Magento/PageBuilder/view/adminhtml/templates/wysiwyg_setup.phtml
index 5a782cc4f01..078413df89e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/templates/wysiwyg_setup.phtml
+++ b/app/code/Magento/PageBuilder/view/adminhtml/templates/wysiwyg_setup.phtml
@@ -1,18 +1,25 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
-/** @var Magento\PageBuilder\Block\WysiwygSetup $block */
+/**
+ * @var Magento\PageBuilder\Block\WysiwygSetup $block
+ * @var Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ */
 
 ?>
-<script>
+<?php
+$config = $block->getConfigJson();
+$script = <<<SCRIPT
     require.config({
         config: {
             'mage/adminhtml/wysiwyg/tiny_mce/setup': {
-                config: <?= /* @noEscape */ $block->getConfigJson() ?>
+                config: {$config}
             }
         }
     });
-</script>
+SCRIPT;
+?>
+<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false) ?>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/cms_page_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/cms_page_form.xml
deleted file mode 100644
index 6e434b92e8c..00000000000
--- a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/cms_page_form.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-    <fieldset name="content">
-        <field name="content_heading">
-            <settings>
-                <validation>
-                    <rule name="validate-no-utf8mb4-characters" xsi:type="boolean">true</rule>
-                </validation>
-            </settings>
-        </field>
-        <field name="content">
-            <settings>
-                <validation>
-                    <rule name="validate-no-utf8mb4-characters" xsi:type="boolean">true</rule>
-                </validation>
-            </settings>
-        </field>
-    </fieldset>
-</form>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_buttons.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_buttons.less
index ff65960869b..a52fa8ce2bf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_buttons.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_buttons.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -15,10 +15,7 @@
 .pagebuilder-button-primary {
     .lib-link-as-button();
     .lib-button-primary(@_button-margin: @pagebuilder-button__margin);
-    .lib-button-l(
-        @_button-l-font-size: @pagebuilder-button__font-size,
-        @_button-l-height: @pagebuilder-button__line-height
-    );
+    .lib-button-l(@_button-l-font-size: @pagebuilder-button__font-size, @_button-l-height: @pagebuilder-button__line-height);
     .lib-css(border-radius, @button__border-radius);
     .lib-css(font-weight, @font-weight__semibold);
 }
@@ -26,21 +23,14 @@
 .pagebuilder-button-secondary {
     .lib-link-as-button();
     .lib-button(@_button-margin: @pagebuilder-button__margin);
-    .lib-button-l(
-        @_button-l-font-size: @pagebuilder-button__font-size,
-        @_button-l-height: @pagebuilder-button__line-height
-    );
+    .lib-button-l(@_button-l-font-size: @pagebuilder-button__font-size, @_button-l-height: @pagebuilder-button__line-height);
     .lib-css(border-radius, @button__border-radius);
     .lib-css(font-weight, @font-weight__semibold);
 }
 
 .pagebuilder-button-link {
     .lib-button-l(@_button-l-font-size: @pagebuilder-button__font-size);
-    .lib-button-as-link(
-        @_margin: @pagebuilder-button__margin,
-        @_padding: @button__padding__l,
-        @_line-height: @pagebuilder-button__line-height
-    );
+    .lib-button-as-link(@_margin: @pagebuilder-button__margin, @_padding: @button__padding__l, @_line-height: @pagebuilder-button__line-height);
     .lib-css(font-weight, @font-weight__semibold);
     display: inline-block;
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less
index eb9c191c617..a7efc976ce1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_common.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less
index cac4cc473e6..6722155a632 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_config.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 .error-border (@color) {
@@ -10,10 +10,8 @@
 
 [data-role='modal'] {
     .action-pagebuilder-cancel,
-    .action-pagebuilder-cancel:hover {
-        color: @color-black;
+    .action-pagebuilder-cancel:hover {color: @color-black;
     }
-
     .pagebuilder-modal-content-body li {
         list-style-position: inside;
         margin-bottom: 15px;
@@ -37,7 +35,7 @@
                     .textarea {
                         .error-border(@field-error-control__border-color);
                     }
-                    .tox-tinymce {
+                    .tox-hugerte {
                         .error-border(@field-error-control__border-color);
                     }
                 }
@@ -48,12 +46,14 @@
 
 //
 //  Page Builder full width field
+
 //  _____________________________________________
 
+//  @phpcs:ignoreFile
+
 .admin__fieldset {
-    > .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option),
-    .admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder {
-        > .admin__field-label {
+    > .admin__field.admin__field-wide.admin__field-page-builder[class]:not(.admin__field-option), // @phpcs:ignore Generic.Commenting.DocComment
+    .admin__field.admin__field-wide.admin__fieldset-page-builder .admin__field-page-builder { > .admin__field-label {
             margin-bottom: @indent__xs;
             margin-top: @indent__xs;
             min-height: 32px;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_drag-drop.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_drag-drop.less
index 6f6aca7f72d..5b4c1c465e0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_drag-drop.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_drag-drop.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 @color-gray_light: #ccc;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_fonts.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_fonts.less
index f5341ee4b76..4b3b6be9a10 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_fonts.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_fonts.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -12,18 +12,10 @@
     font-style: normal;
     font-weight: normal;
     src: url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.eot');
-    src: url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.eot?#iefix') format('embedded-opentype'),
-    url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.woff') format('woff'),
-    url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.ttf') format('truetype'),
-    url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.svg#pagebuilder-icons') format('svg');
+    src: url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.eot?#iefix') format('embedded-opentype'), url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.woff') format('woff'), url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.ttf') format('truetype'), url('@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons.svg#pagebuilder-icons') format('svg');
 }
 
-.lib-font-face(
-    @family-name: 'luma-icons',
-    @font-path: '@{baseDir}Magento_PageBuilder/fonts/luma-icons/Luma-Icons',
-    @font-weight: normal,
-    @font-style: normal
-);
+.lib-font-face(@family-name: 'luma-icons', @font-path: '@{baseDir}Magento_PageBuilder/fonts/luma-icons/Luma-Icons', @font-weight: normal, @font-style: normal);
 
 .pagebuilder-icon {
     /* Better Font Rendering =========== */
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_google-map.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_google-map.less
index c7c0177fda3..c23e2a31451 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_google-map.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_google-map.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_icons.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_icons.less
index d1f9270adb9..ebdd78e3187 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_icons.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_icons.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less
index 76a2f13ca7c..f1d6c881630 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_inline-wysiwyg.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -27,7 +27,7 @@
         min-height: 20px;
         vertical-align: baseline;
     }
-    ~ .tox-tinymce-inline {
+    ~ .tox-hugerte-inline {
         display: block !important;
         height: auto !important;
         opacity: 0;
@@ -41,13 +41,13 @@
 
     &.mce-edit-focus {
         outline: none;
-        ~ .tox-tinymce-inline {
+        ~ .tox-hugerte-inline {
             opacity: 1;
             pointer-events: all;
             visibility: visible !important;
         }
     }
-    &._right-aligned-toolbar ~ div.tox-tinymce-inline {
+    &._right-aligned-toolbar ~ div.tox-hugerte-inline {
         left: auto !important;
     }
     ul,
@@ -67,7 +67,7 @@
     }
 }
 
-.tox-tinymce-aux {
+.tox-hugerte-aux {
     .tox-pop {
         max-width: none !important;
         min-width: 300px;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mixins.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mixins.less
index d914b7f8f5b..0e7f1d3d38a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mixins.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mixins.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 .border-radius (@radius: 3px) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mobile-viewport.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mobile-viewport.less
index c7786004fa4..517a77c1635 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mobile-viewport.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_mobile-viewport.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_module.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_module.less
index fdc8a06e169..016d1b29155 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_module.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less
index 89a278b7a2c..a95caed834c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_page-builder.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 @border-size: 2px; // Deprecated
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_panel.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_panel.less
index 5e5e4958dbe..68ff7e776bc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_panel.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_panel.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less
index 86c4d6bcf62..735e7a4a075 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_template-manager.less
@@ -1,13 +1,11 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
-
-//
-//  Replace box-shadow with borders when capturing a screenshot for template manager
-//  ______________________________________________________________________
-
+/**
+ * @codingStandardsIgnoreStart
+ */
 .pagebuilder-stage.capture .pagebuilder-canvas {
     margin: -10px;
     padding: 10px;
@@ -49,10 +47,6 @@
     padding-top: 10px;
 }
 
-//
-//  Style modal and grid slide out panel
-//  ______________________________________________________________________
-
 .modal-popup.template-manager-save .modal-inner-wrap {
     max-width: 50rem;
 
@@ -133,3 +127,4 @@
         font-size: inherit;
     }
 }
+//  @codeCoverageIgnoreEnd
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_toolbar.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_toolbar.less
index 2ef11c8961b..6c2bfae62c2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_toolbar.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_toolbar.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_typography.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_typography.less
index 8906eca670e..7815b909afa 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_typography.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_typography.less
@@ -1,45 +1,18 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
-.lib-font-face(
-    @family-name: @font-family-name__base,
-    @font-path: '@{baseDir}fonts/opensans/light/opensans-300',
-    @font-style: normal,
-    @font-weight: @font-weight__light
-);
-
-.lib-font-face(
-    @family-name: @font-family-name__base,
-    @font-path: '@{baseDir}fonts/opensans/regular/opensans-400',
-    @font-style: normal,
-    @font-weight: @font-weight__regular
-);
-
-.lib-font-face(
-    @family-name: @font-family-name__base,
-    @font-path: '@{baseDir}fonts/opensans/semibold/opensans-600',
-    @font-style: normal,
-    @font-weight: @font-weight__semibold
-);
-
-.lib-font-face(
-    @family-name: @font-family-name__base,
-    @font-path: '@{baseDir}fonts/opensans/bold/opensans-700',
-    @font-style: normal,
-    @font-weight: @font-weight__bold
-);
+.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/light/opensans-300', @font-style: normal, @font-weight: @font-weight__light);
+
+.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/regular/opensans-400', @font-style: normal, @font-weight: @font-weight__regular);
+
+.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/semibold/opensans-600', @font-style: normal, @font-weight: @font-weight__semibold);
+
+.lib-font-face(@family-name: @font-family-name__base, @font-path: '@{baseDir}fonts/opensans/bold/opensans-700', @font-style: normal, @font-weight: @font-weight__bold);
 
 body {
-    .lib-typography(
-        @_color: @text__color,
-        @_font-family: @font-family__base,
-        @_font-size: @font-size__base,
-        @_font-style: @font-style__base,
-        @_font-weight: @font-weight__regular,
-        @_line-height: @line-height__base
-    );
+    .lib-typography(@_color: @text__color, @_font-family: @font-family__base, @_font-size: @font-size__base, @_font-style: @font-style__base, @_font-weight: @font-weight__regular, @_line-height: @line-height__base);
 }
 
 .pagebuilder-stage {
@@ -50,79 +23,37 @@ body {
     h1 {
         margin: 0 0 40px;
 
-        .lib-typography(
-            @_color: @color-gray20,
-            @_font-family: false,
-            @_font-size: 40px,
-            @_font-style: false,
-            @_font-weight: @font-weight__light,
-            @_line-height: 44px
-        );
+        .lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 40px, @_font-style: false, @_font-weight: @font-weight__light,@_line-height: 44px);
     }
 
     h2 {
         margin: 25px 0 20px;
 
-        .lib-typography(
-            @_color: @color-gray20,
-            @_font-family: false,
-            @_font-size: 26px,
-            @_font-style: false,
-            @_font-weight: @font-weight__light,
-            @_line-height: 1.1
-        );
+        .lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 26px, @_font-style: false, @_font-weight: @font-weight__light, @_line-height: 1.1);
     }
 
     h3 {
         margin: 20px 0 10px;
 
-        .lib-typography(
-            @_color: @color-gray20,
-            @_font-family: false,
-            @_font-size: 18px,
-            @_font-style: false,
-            @_font-weight: @font-weight__semibold,
-            @_line-height: 1.1
-        );
+        .lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 18px, @_font-style: false, @_font-weight: @font-weight__semibold, @_line-height: 1.1);
     }
 
     h4 {
         margin: 20px 0;
 
-        .lib-typography(
-            @_color: @color-gray20,
-            @_font-family: false,
-            @_font-size: 14px,
-            @_font-style: false,
-            @_font-weight: @font-weight__bold,
-            @_line-height: 1.1
-        );
+        .lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 14px, @_font-style: false, @_font-weight: @font-weight__bold, @_line-height: 1.1);
     }
 
     h5 {
         margin: 20px 0;
 
-        .lib-typography(
-            @_color: @color-gray20,
-            @_font-family: false,
-            @_font-size: 12px,
-            @_font-style: false,
-            @_font-weight: @font-weight__bold,
-            @_line-height: 1.1
-        );
+        .lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 12px, @_font-style: false, @_font-weight: @font-weight__bold, @_line-height: 1.1);
     }
 
     h6 {
         margin: 20px 0;
 
-        .lib-typography(
-            @_color: @color-gray20,
-            @_font-family: false,
-            @_font-size: 10px,
-            @_font-style: false,
-            @_font-weight: @font-weight__bold,
-            @_line-height: 1.1
-        );
+        .lib-typography(@_color: @color-gray20, @_font-family: false, @_font-size: 10px, @_font-style: false, @_font-weight: @font-weight__bold, @_line-height: 1.1);
     }
 
     //
@@ -209,7 +140,7 @@ body {
             outline: 2px solid @placeholder-error-outline-mce;
         }
     }
-    
+
     .magento-placeholder-error,
     .magento-placeholder {
         img {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less
index 800b1e9940b..17cfad097bc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/_var.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -41,6 +41,7 @@
 @placeholder-error-outline: #f7aaaa;
 @placeholder-error-outline-mce: #e12525;
 @color-white-fog: #f8f8f8;
+@color-red-berry: rgba(142, 0, 6, .3);
 
 //
 //  Fonts
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_import.less
index ed3ff4993fe..59fe7e471c1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -15,6 +15,7 @@
 @import 'buttons/_import.less';
 @import 'column/_import.less';
 @import 'column-group/_import.less';
+@import 'column-line/_import.less';
 @import 'divider/_import.less';
 @import 'heading/_import.less';
 @import 'html/_import.less';
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less
index 9f396f2e1a8..ce40d3fb572 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/_preview.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 .pagebuilder-content-type {
@@ -195,7 +195,7 @@
     border: 15px solid @color-gray98;
     box-shadow: @pagebuilder-affordance-box-shadow; // #ebebeb
     padding: 0;
-    
+
     &:not(
     .pagebuilder-column
     ) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-center.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-center.less
index fa4fa7dcb8b..f0b9b861900 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-center.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-center.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-right.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-right.less
index ceb563bee04..4e9ce0e44c2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-right.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_collage-right.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less
index 320f1303787..e3cae8852f2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -43,7 +43,7 @@
     .pagebuilder-banner-text-content {
         position: relative;
 
-        .tox-tinymce-inline {
+        .tox-hugerte-inline {
             left: -1px !important;
             right: -1px;
             z-index: 20;
@@ -136,7 +136,9 @@
 //
 //  Default appearance styles rendered through Block only
 //  _____________________________________________________
-
+/**
+ * @codingStandardsIgnoreStart
+ */
 [data-content-type='banner'] {
     .pagebuilder-banner-wrapper {
         overflow-wrap: break-word;
@@ -166,3 +168,4 @@
         }
     }
 }
+//  @codeCoverageIgnoreEnd
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_import.less
index 841e7b70815..50257da1d2f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_mobile.less
index fc6c8aead32..a5f461f632f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_mobile.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_mobile.less
@@ -1,11 +1,15 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
 //  Default appearance styles rendered through Mobile viewport
 //  _____________________________________________________
+
+/**
+ * @codingStandardsIgnoreStart
+ */
 .mobile-viewport {
     .pagebuilder-banner-wrapper {
         .pagebuilder-overlay:not(.pagebuilder-poster-overlay) {
@@ -13,3 +17,4 @@
         }
     }
 }
+//  @codingStandardsIgnoreEnd
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_poster.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_poster.less
index a0dd710093a..db285ba1f0a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_poster.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/banner/_poster.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_default.less
index e440015a97e..9ce0c555127 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_import.less
index aaa438e9a09..9846bbb6ce7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_mobile.less
index 925f1b95fc9..06390e4ea2c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_mobile.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/block/_mobile.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 //
 //  Default appearance styles rendered through Mobile viewport
@@ -8,7 +8,8 @@
 .mobile-viewport {
     .pagebuilder-content-type.pagebuilder-block {
         .rendered-content {
-            .pagebuilder-column-group {
+            .pagebuilder-column-group,
+            .pagebuilder-column-line {
                 flex-wrap: wrap;
                 .pagebuilder-column {
                     flex-basis: 100%;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less
index 8908df4466f..d2175024428 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -46,12 +46,14 @@
             transition: all .3s;
             visibility: hidden;
             width: 14px;
-
+            /**
+             * @codingStandardsIgnoreStart
+             */
             &.disabled:before {
                 color: @color-light-gray;
                 cursor: not-allowed;
             }
-
+            //  @codingStandardsIgnoreEnd
             &.disabled:active:before {
                 cursor: not-allowed;
             }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/button-item/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_default.less
index cae6e98076d..48552819d7e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/buttons/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less
index 1cc3a54a91a..3b2cc82af9f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -22,11 +22,10 @@
 .pagebuilder-content-type {
     .pagebuilder-column-group {
         box-sizing: border-box;
-        position: relative;
         width: 100%;
 
         .drop-placeholder {
-            background: rgba(142, 0, 6, .3);
+            background: @color-red-berry;
             bottom: 0;
             opacity: 0;
             position: absolute;
@@ -51,7 +50,7 @@
 
         .move-placeholder {
             animation: inner-pulsate 1s infinite ease-in-out;
-            background: rgba(142, 0, 6, .3);
+            background: @color-red-berry;
             bottom: 0;
             opacity: 0;
             position: absolute;
@@ -149,7 +148,6 @@
         }
 
         > .element-children {
-            display: flex;
             padding: 0;
             position: relative;
             width: 100%;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_import.less
index aaa438e9a09..9846bbb6ce7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_mobile.less
index 2a70116cbf0..9fde9198283 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_mobile.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-group/_mobile.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_default.less
new file mode 100644
index 00000000000..2a8094d6750
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_default.less
@@ -0,0 +1,49 @@
+// /**
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
+//  */
+
+//
+//  Default appearance styles
+//
+//  _____________________________________________
+
+.pagebuilder-column-line {
+    position: relative;
+    width: 100%;
+
+    .bottom-drop-placeholder,
+    .column-drop-placeholder {
+        background: @color-red-berry;
+        display: none;
+        height: 30px;
+        z-index: 26;
+    }
+
+    &.resizing {
+        .pagebuilder-grid-size-indicator {
+            z-index: 105;
+        }
+
+        .resize-grid {
+            opacity: 1;
+            transition: .5s opacity;
+            visibility: visible;
+        }
+
+        .pagebuilder-options {
+            display: none;
+        }
+
+        .pagebuilder-content-type {
+            .pagebuilder-empty {
+                opacity: 0;
+            }
+        }
+    }
+
+    > .element-children {
+        display: flex;
+        width: 100%;
+    }
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_import.less
new file mode 100644
index 00000000000..9846bbb6ce7
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_import.less
@@ -0,0 +1,11 @@
+// /**
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
+//  */
+
+//
+//  _import imports all appearance less files
+//  _____________________________________________
+
+@import './_default.less';
+@import './_mobile.less';
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_mobile.less
new file mode 100644
index 00000000000..f3d0855b76d
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column-line/_mobile.less
@@ -0,0 +1,21 @@
+// /**
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
+//  */
+
+//
+//  Default appearance styles rendered through Mobile viewport
+//  _____________________________________________________
+.mobile-viewport {
+    .pagebuilder-content-type {
+        .pagebuilder-column-line {
+            > .element-children {
+                flex-wrap: wrap;
+            }
+        }
+
+        &.children-min-height.pagebuilder-column {
+            width: 100% !important;
+        }
+    }
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less
index 7433d44eede..fd6d0a7d389 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -27,7 +27,7 @@
 }
 
 .pagebuilder-content-type.pagebuilder-column {
-    min-height: inherit;
+    min-height: 150px;
 
     &.empty-container {
         min-height: 300px;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_import.less
index aaa438e9a09..9846bbb6ce7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_mobile.less
index af3110219fd..3d53874c0cf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_mobile.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/column/_mobile.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_default.less
index d29667635ce..1201bea9a48 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_default.less
@@ -1,12 +1,14 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
 //  Default appearance styles
 //  _____________________________________________
 
+
+//  @codingStandardsIgnoreStart
 .pagebuilder-divider hr {
     border: none;
     border-color: @border_color_empty; // match for default color on frontend
@@ -18,3 +20,4 @@
     max-width: 100%;
     width: 100%;
 }
+//  @codingStandardsIgnoreEnd
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/divider/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_default.less
index ae206ae2d4f..7954f291101 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/heading/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_default.less
index 1f9fa99d318..e6404fb617f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/html/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less
index 6b17c9f175c..cb41bc9016e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_import.less
index aaa438e9a09..9846bbb6ce7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_mobile.less
index e560fd520bf..e35bed15dc5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_mobile.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/image/_mobile.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_default.less
index 7245354ad81..6931cd013e9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/map/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_carousel.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_carousel.less
index 9c6bf0be8a6..d70aa20b0bf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_carousel.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_carousel.less
@@ -1,7 +1,7 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+// * Copyright 2019 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Carousel appearance styles
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_default.less
index b561d199b11..d9207e9fcc1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_default.less
@@ -1,7 +1,7 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
@@ -27,10 +27,6 @@
         margin-left: -20px;
     }
 
-    .product-items {
-        &:extend(.abs-reset-list all);
-    }
-
     .product-item {
         display: inline-block;
         max-width: 100%;
@@ -40,8 +36,6 @@
         vertical-align: top;
         width: 200px;
 
-        &:extend(.abs-add-box-sizing all);
-
         a,
         button,
         .swatch-attribute-options {
@@ -192,24 +186,16 @@
             }
 
             &.towishlist {
-                &:extend(.abs-actions-addto all);
-                .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-wishlist-full,
-                    @_icon-font-position: before
-                );
+                .lib-icon-font-symbol(@_icon-font-content: @icon-wishlist-full, @_icon-font-position: before);
             }
 
             &.tocompare {
-                .lib-icon-font-symbol(
-                    @_icon-font-content: @icon-compare-full,
-                    @_icon-font-position: before
-                );
+                .lib-icon-font-symbol(@_icon-font-content: @icon-compare-full, @_icon-font-position: before);
             }
         }
     }
 
     .product-item-name {
-        &:extend(.abs-product-link all);
         -moz-hyphens: auto;
         -ms-hyphens: auto;
         -webkit-hyphens: auto;
@@ -251,11 +237,7 @@
         }
 
         .rating-summary {
-            .lib-rating-summary(
-                @_icon-font: 'luma-icons',
-                @_icon-font-size: 16px,
-                @_icon-letter-spacing: 2px
-            );
+            .lib-rating-summary(@_icon-font: 'luma-icons', @_icon-font-size: 16px, @_icon-letter-spacing: 2px);
             .lib-rating-summary-label-hide();
 
             display: inline-block;
@@ -274,7 +256,6 @@
         overflow: hidden;
         position: relative;
         z-index: 1;
-        &:extend(.abs-reset-image-wrapper all);
     }
 
     .product-image-container {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_import.less
index a5209a054b5..c8318c4620f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_swatches.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_swatches.less
index ca134cb0dcf..2f0f9b6a7f2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_swatches.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/products/_swatches.less
@@ -1,12 +1,13 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
 //  Variables
 //  _____________________________________________
 
+//  @codingStandardsIgnoreStart
 @swatch-attribute-option__selected__color: #646464;
 
 @swatch-option__background: @color-gray94;
@@ -185,7 +186,7 @@
                     pointer-events: none;
 
                     &:after {
-                        //  ToDo: improve .lib-background-gradient() to support diagonal gradient
+                        //  improve .lib-background-gradient() to support diagonal gradient
                         background: linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
                         background: -moz-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
                         background: -ms-linear-gradient(to left top, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 42%, rgba(255, 255, 255, 1) 43%, rgba(255, 255, 255, 1) 46%, rgba(255, 82, 22, 1) 47%, rgba(255, 82, 22, 1) 53%, rgba(255, 255, 255, 1) 54%, rgba(255, 255, 255, 1) 57%, rgba(255, 255, 255, 0) 58%, rgba(255, 255, 255, 0) 100%);
@@ -356,3 +357,4 @@
         }
     }
 }
+//  @codingStandardsIgnoreEnd
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_contained.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_contained.less
index 51410c82f14..09d2844bf5f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_contained.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_contained.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_default.less
index 3168b67155f..f8ba267ff27 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_full-width.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_full-width.less
index e2f2bae2f15..1ba5ff54825 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_full-width.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_full-width.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_import.less
index 0595cd60032..2efdc73cd73 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/row/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-center.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-center.less
index 12c18daf827..3ea748ee7ef 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-center.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-center.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -17,7 +17,7 @@
         transition: background-color 500ms ease;
 
         &.wysiwyg-container {
-            .tox-tinymce-inline {
+            .tox-hugerte-inline {
                 left: 29px !important;
                 right: 29px;
             }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-left.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-left.less
index 58c37f7f792..283fd24cf1c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-left.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-left.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -15,7 +15,7 @@
         transition: background-color 500ms ease;
 
         &.wysiwyg-container {
-            .tox-tinymce-inline {
+            .tox-hugerte-inline {
                 left: 29px !important;
                 right: 29px;
             }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-right.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-right.less
index 3a97267b089..4c1e632eb32 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-right.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_collage-right.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -16,7 +16,7 @@
         transition: background-color 500ms ease;
 
         &.wysiwyg-container {
-            .tox-tinymce-inline {
+            .tox-hugerte-inline {
                 left: 29px !important;
                 right: 29px;
             }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less
index 5882132b35c..3450a545f5c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -24,6 +24,10 @@
         max-width: 540px;
     }
 
+    .tox .tox-dialog-wrap {
+        bottom: auto;
+    }
+
     .pagebuilder-slide-button {
         -moz-transition: all 500ms ease;
         -o-transition: all 500ms ease;
@@ -59,7 +63,7 @@
                 left: -99999px;
             }
         }
-        .tox-tinymce-inline {
+        .tox-hugerte-inline {
             left: -1px !important;
             right: -1px;
         }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_import.less
index 422413cd12c..8b700dffdef 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_poster.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_poster.less
index 039a67d7ed7..8c326414b3a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_poster.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slide/_poster.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less
index f7f58f4dd0e..e05e81e4053 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 @b3: #b3b3b3;
@@ -96,10 +96,7 @@
                 vertical-align: top;
                 width: 36px;
 
-                .lib-tooltip(
-                    @_tooltip-position: top,
-                    @_tooltip-color: @color-gray80
-                );
+                .lib-tooltip(@_tooltip-position: top, @_tooltip-color: @color-gray80);
 
                 .tooltip-content {
                     background: @color-lazy-sun;
@@ -219,7 +216,7 @@
                         width: 12px;
                     }
                 }
-
+                //  @codingStandardsIgnoreStart
                 &.active {
                     .navigation-dot-anchor:after {
                         background: @color-very-dark-grayish-orange;
@@ -230,7 +227,7 @@
                         z-index: auto;
                     }
                 }
-
+                //  @codingStandardsIgnoreEnd
                 &.focus {
                     outline: 1px solid @color-blue-pure;
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/slider/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_default.less
index 4fe75c6ac0a..50a51e34173 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tab-item/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less
index afe8d4fd6d1..d1bc4ed7536 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_default.less
@@ -1,14 +1,17 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
-@color-gray: #ccc;
-
 //
 //  Default appearance styles
 //  _____________________________________________
 
+/**
+ * @codingStandardsIgnoreStart
+ */
+@color-gray: #ccc;
+
 div[data-content-type='tabs'],
 .pagebuilder-content-type.pagebuilder-tabs {
     .tabs-navigation {
@@ -219,3 +222,4 @@ div[data-content-type='tabs'] {
 .pagebuilder-content-type-hidden .pagebuilder-content-type.pagebuilder-tabs .tabs-navigation li.tab-header.ui-state-active {
     z-index: 10;
 }
+//  @codingStandardsIgnoreEnd
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/tabs/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less
index 381d7342f11..3c8165952e2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
@@ -10,7 +10,7 @@
 .pagebuilder-content-type.pagebuilder-text {
     border-width: 0;
 
-    .tox-tinymce-inline {
+    .tox-hugerte-inline {
         left: -1px !important;
         right: -1px;
         z-index: 20;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/text/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_default.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_default.less
index 9e6af50a4c5..bd9b6c4da73 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_default.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_default.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_import.less
index 5dcbad8d6e6..5e0a38b9582 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/content-type/video/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/_import.less
index 40c434fada5..34c287ca437 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_dynamic-rows.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_dynamic-rows.less
index ae8772a8010..f34fc89b1df 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_dynamic-rows.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_dynamic-rows.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_import.less
index 653d0990a18..1fe76e4d3d0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/components/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_container.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_container.less
index f47108c1659..53961880f5b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_container.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_container.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_import.less
index d601e2be771..9b7de3eb63f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_import.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_map.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_map.less
index ce7d952c504..0b205b406e7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_map.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_map.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_margins-and-padding.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_margins-and-padding.less
index 400dac37ff2..ef41ce16679 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_margins-and-padding.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_margins-and-padding.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 @metrics-width: 480px;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_mobile.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_mobile.less
index 0347a800cbf..f1e9308a93d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_mobile.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_mobile.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_product-totals.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_product-totals.less
index 363c7580087..58dbb871469 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_product-totals.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_product-totals.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 [data-index='product_totals'] .spinner {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_visual-select.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_visual-select.less
index 409c553ca0b..92c5af927d1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_visual-select.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/_visual-select.less
@@ -1,7 +1,7 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Visual Select less
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/tinymce.css b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/tinymce.css
index 10cd5cdace1..848dd98942b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/tinymce.css
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/tinymce.css
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 @font-face {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/uploader/preview/_image.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/uploader/preview/_image.less
index 74d6374833a..7981f6b47b6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/uploader/preview/_image.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/form/element/uploader/preview/_image.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/grid/cells/_single-select.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/grid/cells/_single-select.less
index a2a8bd164e8..fa80158d475 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/grid/cells/_single-select.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/grid/cells/_single-select.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 //
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/modal/_dismissible.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/modal/_dismissible.less
index 3c965038f24..561fbd88c7c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/modal/_dismissible.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/modal/_dismissible.less
@@ -1,6 +1,6 @@
-//  /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+// /**
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 .modal-popup .modal-dnsa {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/slick/_slick.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/slick/_slick.less
index 2a5cda0d22f..52a6668912d 100755
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/slick/_slick.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/slick/_slick.less
@@ -1,6 +1,6 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
+//  * Copyright 2018 Adobe
+//  * All Rights Reserved.
 //  */
 
 @color-slick-dark-gray: #3d3d3d;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/stage/widget/_import.less b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/stage/widget/_import.less
index 73d6d3e3693..dcb5736821b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/stage/widget/_import.less
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/css/source/stage/widget/_import.less
@@ -1,7 +1,7 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Widget less Imports
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js
index 10c79fc2e9a..98a91c95b39 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/banner/preview.js
@@ -423,6 +423,14 @@ define(["jarallax", "jarallaxVideo", "jquery", "jquery/z-index", "mage/translate
     _proto.bindEvents = function bindEvents() {
       var _this8 = this;
 
+      this.contentType.dataStore.subscribe(function (state) {
+        var sanitizedContent = (0, _editor.removeReservedHtmlAttributes)(state.message);
+
+        if (sanitizedContent !== state.message) {
+          state.message = sanitizedContent;
+        }
+      }, "message");
+
       _preview2.prototype.bindEvents.call(this);
 
       _events.on("banner:mountAfter", function (args) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/factory.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/factory.js
index a28091cb36b..134103880c1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/factory.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/factory.js
@@ -25,9 +25,31 @@ define(["Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-fa
       return null;
     });
   }
+  /**
+   * Create a column and add it to it's column group
+   *
+   * @param {ContentTypeCollectionInterface} columnGroup
+   * @param {number} width
+   * @param {number} index
+   * @returns {Promise<ContentTypeCollectionInterface>}
+   */
+
+
+  function createColumnLine(columnGroup, width, index) {
+    return (0, _contentTypeFactory)(_config.getContentTypeConfig("column-line"), columnGroup, columnGroup.stageId, {
+      width: parseFloat(width.toString()) + "%"
+    }).then(function (columnLine) {
+      columnGroup.addChild(columnLine, index);
+      return columnLine;
+    }).catch(function (error) {
+      console.error(error);
+      return null;
+    });
+  }
 
   return {
-    createColumn: createColumn
+    createColumn: createColumn,
+    createColumnLine: createColumnLine
   };
 });
 //# sourceMappingURL=factory.js.map
\ No newline at end of file
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/grid-size.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/grid-size.js
index 97d70a65bcf..3525e576cfa 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/grid-size.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/grid-size.js
@@ -67,12 +67,15 @@ define(["mage/translate", "Magento_PageBuilder/js/config", "Magento_PageBuilder/
       return;
     }
 
-    validateNewGridSize(columnGroup, newGridSize); // if we have more columns than the new grid size allows, remove empty columns until we are at the correct size
-
-    if (newGridSize < columnGroup.getChildren()().length) {
-      removeEmptyColumnsToFit(columnGroup, newGridSize);
-    } // update column widths
+    validateNewGridSize(columnGroup, newGridSize);
+    columnGroup.getChildren()().forEach(function (columnLine, index) {
+      // if we have more columns than the new grid size allows, remove empty columns till the correct size
+      console.log(columnLine.getChildren()().length);
 
+      if (newGridSize < columnLine.getChildren()().length) {
+        removeEmptyColumnsToFit(columnLine, newGridSize);
+      }
+    }); // update column widths
 
     redistributeColumnWidths(columnGroup, newGridSize, gridSizeHistory);
   }
@@ -93,20 +96,27 @@ define(["mage/translate", "Magento_PageBuilder/js/config", "Magento_PageBuilder/
     } // Validate that the operation will be successful
 
 
-    var numCols = columnGroup.getChildren()().length;
-    var currentGridSize = columnGroup.preview.getResizeUtils().getInitialGridSize();
-
-    if (newGridSize < currentGridSize && numCols > newGridSize) {
+    var doThrowException = false;
+    columnGroup.getChildren()().forEach(function (columnLine, index) {
       var numEmptyColumns = 0;
-      columnGroup.getChildren()().forEach(function (column) {
-        if (column.getChildren()().length === 0) {
-          numEmptyColumns++;
-        }
-      });
+      var numCols = columnLine.getChildren()().length;
+      var currentGridSize = columnLine.preview.getResizeUtils().getInitialGridSize();
 
-      if (newGridSize < numCols - numEmptyColumns) {
-        throw new GridSizeError((0, _translate)("Grid size cannot be smaller than the current total amount of columns, minus any empty columns."));
+      if (newGridSize < currentGridSize && numCols > newGridSize) {
+        columnLine.getChildren()().forEach(function (column) {
+          if (column.getChildren()().length === 0) {
+            numEmptyColumns++;
+          }
+        });
+
+        if (newGridSize < numCols - numEmptyColumns) {
+          doThrowException = true;
+        }
       }
+    });
+
+    if (doThrowException) {
+      throw new Error((0, _translate)("Grid size cannot be smaller than the current total amount of columns, minus any empty columns."));
     }
   }
   /**
@@ -117,8 +127,8 @@ define(["mage/translate", "Magento_PageBuilder/js/config", "Magento_PageBuilder/
    */
 
 
-  function removeEmptyColumnsToFit(columnGroup, newGridSize) {
-    var columns = columnGroup.getChildren()();
+  function removeEmptyColumnsToFit(columnLine, newGridSize) {
+    var columns = columnLine.getChildren()();
     var numColumns = columns.length;
     var i;
 
@@ -126,7 +136,7 @@ define(["mage/translate", "Magento_PageBuilder/js/config", "Magento_PageBuilder/
       var column = columns[i];
 
       if (newGridSize < numColumns && column.getChildren()().length === 0) {
-        columnGroup.removeChild(column);
+        columnLine.removeChild(column);
         numColumns--;
       }
     }
@@ -153,73 +163,80 @@ define(["mage/translate", "Magento_PageBuilder/js/config", "Magento_PageBuilder/
       return;
     }
 
-    var resizeUtils = columnGroup.preview.getResizeUtils();
-    var existingGridSize = resizeUtils.getInitialGridSize();
+    var columnGroupResizeUtil = columnGroup.preview.getResizeUtils();
+    var existingGridSize = columnGroupResizeUtil.getInitialGridSize();
     var minColWidth = parseFloat((100 / newGridSize).toString()).toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0);
-    var totalNewWidths = 0;
-    var numColumns = columnGroup.getChildren()().length;
-    var remainingWidth = 0;
-    columnGroup.getChildren()().forEach(function (column, index) {
-      var existingWidth = resizeUtils.getColumnWidth(column);
-      var fractionColumnWidth = Math.round(existingWidth / (100 / existingGridSize));
-      /**
-       * Determine if the grid & column are directly compatible with the new defined grid size, this will directly
-       * convert fractions to their equivalent of the new grid size.
-       *
-       * For instance changing a 12 column grid with 2 x 6 / 12 columns to a 6 grid is fully compatible.
-       *
-       * Check the existing grid size and new grid size are divisible, verify the amount of columns will fit
-       * in the new grid size and finally check the calculation to convert the existing column width results in a
-       * positive integer.
-       */
-
-      if ((existingGridSize > newGridSize && existingGridSize % newGridSize === 0 || existingGridSize < newGridSize && newGridSize % existingGridSize === 0) && newGridSize % numColumns === 0 && newGridSize / existingGridSize * fractionColumnWidth % 1 === 0) {
-        // We don't need to modify the columns width as it's directly compatible, we will however increment the
-        // width counter as some other columns may not be compatible.
-        totalNewWidths += existingWidth;
-      } else {
-        var newWidth = (100 * Math.floor(existingWidth / 100 * newGridSize) / newGridSize).toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0); // make sure the column is at least one grid size wide
+    columnGroup.getChildren()().forEach(function (columnLine, columnLineIndex) {
+      var totalNewWidths = 0;
+      var remainingWidth = 0;
+      var numColumns = columnLine.getChildren()().length;
+      var resizeUtils = columnLine.preview.getResizeUtils();
+      columnLine.getChildren()().forEach(function (column, index) {
+        var existingWidth = resizeUtils.getColumnWidth(column);
+        var fractionColumnWidth = Math.round(existingWidth / (100 / existingGridSize));
+        /**
+         * Determine if the grid & column are directly compatible with the new defined grid size, this will
+         * directly convert fractions to their equivalent of the new grid size.
+         *
+         * For instance changing a 12 column grid with 2 x 6 / 12 columns to a 6 grid is fully compatible.
+         *
+         * Check the existing grid size and new grid size are divisible, verify the amount of columns will fit
+         * in the new grid size and finally check the calculation to convert the existing column width results
+         * in a positive integer.
+         */
 
-        if (parseFloat(newWidth) < parseFloat(minColWidth)) {
-          newWidth = minColWidth;
-        } // make sure we leave enough space for other columns
+        if ((existingGridSize > newGridSize && existingGridSize % newGridSize === 0 || existingGridSize < newGridSize && newGridSize % existingGridSize === 0) && newGridSize % numColumns === 0 && newGridSize / existingGridSize * fractionColumnWidth % 1 === 0) {
+          // We don't need to modify the columns width as it's compatible, we will however increment the
+          // width counter as some other columns may not be compatible.
+          totalNewWidths += existingWidth;
+        } else {
+          var newWidth = (100 * Math.floor(existingWidth / 100 * newGridSize) / newGridSize).toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0); // make sure the column is at least one grid size wide
 
+          if (parseFloat(newWidth) < parseFloat(minColWidth)) {
+            newWidth = minColWidth;
+          } // make sure we leave enough space for other columns
 
-        var maxAvailableWidth = 100 - totalNewWidths - (numColumns - index - 1) * parseFloat(minColWidth);
 
-        if (parseFloat(newWidth) > maxAvailableWidth) {
-          newWidth = maxAvailableWidth.toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0);
-        } // Calculate any width lost from the column, if a 5 / 12 is becoming a 2 / 6 then it's lost 1 / 12
+          var widthTaken = totalNewWidths + (numColumns - index - 1) * parseFloat(minColWidth);
+          var maxAvailableWidth = 100 - totalNewWidths;
 
+          if (parseFloat(newWidth) > maxAvailableWidth) {
+            var gridWidth = Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0;
+            newWidth = maxAvailableWidth.toFixed(gridWidth);
+          } // Calculate any width lost from the column, if a 5 / 12 is becoming a 2 / 6 then it's lost 1 / 12
 
-        remainingWidth += existingWidth - parseFloat(newWidth);
-        /**
-         * Determine if we have enough remaining width, and apply it to the current column, this results in a
-         * subsequent column always receiving any additional width from the previous column
-         */
 
-        if (resizeUtils.getSmallestColumnWidth(newGridSize) === resizeUtils.getAcceptedColumnWidth(remainingWidth.toString(), newGridSize)) {
-          var widthWithRemaining = resizeUtils.getAcceptedColumnWidth((parseFloat(newWidth) + remainingWidth).toString(), newGridSize);
+          remainingWidth += existingWidth - parseFloat(newWidth);
+          /**
+           * Determine if we have enough remaining width, and apply it to the current column, this results in
+           * a subsequent column always receiving any additional width from the previous column
+           */
 
-          if (widthWithRemaining > 0) {
-            newWidth = widthWithRemaining.toFixed(Math.round(100 / widthWithRemaining) !== 100 / widthWithRemaining ? 8 : 0);
-            remainingWidth = 0;
-          }
-        }
+          if (resizeUtils.getSmallestColumnWidth(newGridSize) === resizeUtils.getAcceptedColumnWidth(remainingWidth.toString(), newGridSize)) {
+            var widthWithRemaining = resizeUtils.getAcceptedColumnWidth((parseFloat(newWidth) + remainingWidth).toString(), newGridSize);
 
-        totalNewWidths += parseFloat(newWidth);
-        (0, _resize.updateColumnWidth)(column, parseFloat(newWidth));
-      }
+            if (widthWithRemaining > 0) {
+              newWidth = widthWithRemaining.toFixed(Math.round(100 / widthWithRemaining) !== 100 / widthWithRemaining ? 8 : 0);
+              remainingWidth = 0;
+            }
+          }
 
-      column.preview.updateDisplayLabel();
-    }); // persist new grid size so upcoming calls to get column widths are calculated correctly
+          totalNewWidths += parseFloat(newWidth);
+          (0, _resize.updateColumnWidth)(column, parseFloat(newWidth));
+        }
 
+        column.preview.updateDisplayLabel();
+      });
+    });
     columnGroup.dataStore.set("grid_size", newGridSize);
-    columnGroup.dataStore.unset("initial_grid_size"); // apply leftover columns if the new grid size did not distribute evenly into existing columns
+    columnGroup.dataStore.unset("initial_grid_size");
+    columnGroup.getChildren()().forEach(function (columnLine, index) {
+      var resizeUtils = columnLine.preview.getResizeUtils();
 
-    if (Math.round(resizeUtils.getColumnsWidth()) < 100) {
-      applyLeftoverColumns(columnGroup, newGridSize);
-    }
+      if (Math.round(resizeUtils.getColumnsWidth()) < 100) {
+        applyLeftoverColumnsInColumnLine(columnLine, newGridSize);
+      }
+    });
   }
   /**
    * Make sure the full grid size is distributed across the columns
@@ -244,6 +261,29 @@ define(["mage/translate", "Magento_PageBuilder/js/config", "Magento_PageBuilder/
       }
     }
   }
+  /**
+   * Make sure the full grid size is distributed across the columns
+   *
+   * @param {ContentTypeCollectionInterface<Preview>} columnGroup
+   * @param {number} newGridSize
+   */
+
+
+  function applyLeftoverColumnsInColumnLine(columnLine, newGridSize) {
+    var resizeUtils = columnLine.preview.getResizeUtils();
+    var minColWidth = parseFloat((100 / newGridSize).toString()).toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0);
+    var column;
+
+    for (var _iterator2 = _createForOfIteratorHelperLoose(columnLine.getChildren()()), _step2; !(_step2 = _iterator2()).done;) {
+      column = _step2.value;
+
+      if (Math.round(resizeUtils.getColumnsWidth()) < 100) {
+        (0, _resize.updateColumnWidth)(column, parseFloat(resizeUtils.getColumnWidth(column).toString()) + parseFloat(minColWidth));
+      } else {
+        break;
+      }
+    }
+  }
 
   var GridSizeError = /*#__PURE__*/function (_Error) {
     "use strict";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js
index 5a80aa04ec1..f4c7b2e075e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-group/preview.js
@@ -15,7 +15,7 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-type-menu/hide-show-option", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/drag-drop/move-content-type", "Magento_PageBuilder/js/drag-drop/registry", "Magento_PageBuilder/js/drag-drop/sortable", "Magento_PageBuilder/js/utils/create-stylesheet", "Magento_PageBuilder/js/content-type/column/resize", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column-group/drag-and-drop", "Magento_PageBuilder/js/content-type/column-group/factory", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column-group/registry"], function (_jquery, _knockout, _translate, _hideShowOption, _events, _underscore, _config, _contentTypeFactory, _moveContentType, _registry, _sortable, _createStylesheet, _resize, _previewCollection, _dragAndDrop, _factory, _gridSize, _registry2) {
+define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-type-menu/hide-show-option", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/drag-drop/move-content-type", "Magento_PageBuilder/js/drag-drop/registry", "Magento_PageBuilder/js/drag-drop/sortable", "Magento_PageBuilder/js/utils/check-stage-full-screen", "Magento_PageBuilder/js/utils/create-stylesheet", "Magento_PageBuilder/js/content-type/column/resize", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column-group/drag-and-drop", "Magento_PageBuilder/js/content-type/column-group/factory", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column-group/registry"], function (_jquery, _knockout, _translate, _hideShowOption, _events, _underscore, _config, _contentTypeFactory, _moveContentType, _registry, _sortable, _checkStageFullScreen, _createStylesheet, _resize, _previewCollection, _dragAndDrop, _factory, _gridSize, _registry2) {
   function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
   /**
@@ -89,14 +89,6 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
             _this.spreadWidth(args.index);
           });
         }
-      }); // Listen for resizing events from child columns
-
-
-      _events.on("column:resizeHandleBindAfter", function (args) {
-        // Does the events content type match the previews column group?
-        if (args.columnGroup.id === _this.contentType.id) {
-          _this.registerResizeHandle(args.column, args.handle);
-        }
       });
 
       _events.on("column:initializeAfter", function (args) {
@@ -106,6 +98,19 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
         }
       });
 
+      _events.on("stage:" + _this.contentType.stageId + ":readyAfter", _this.moveContentsToNewColumnGroup.bind(_assertThisInitialized(_this)));
+
+      _events.on("column-group:renderAfter", function (args) {
+        if (args.contentType.id === _this.contentType.id) {
+          if (!_this.hasColumnLine(args.contentType)) {
+            args.element.classList.add("no-column-line");
+          } else {
+            args.element.classList.remove("no-column-line");
+            args.element.classList.add("with-column-line");
+          }
+        }
+      });
+
       _this.contentType.children.subscribe(_underscore.debounce(_this.removeIfEmpty.bind(_assertThisInitialized(_this)), 50));
 
       return _this;
@@ -128,7 +133,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
       });
       var appearance = this.contentType.dataStore.get("appearance") ? this.contentType.dataStore.get("appearance") : "default";
       this.contentType.dataStore.set("appearance", appearance);
-      this.contentType.dataStore.set("non_empty_column_count", numCols - numEmptyColumns);
+      this.contentType.dataStore.set("non_empty_column_count", this.getNonEmptyColumnCount());
       this.contentType.dataStore.set("max_grid_size", (0, _gridSize.getMaxGridSize)());
       this.contentType.dataStore.set("initial_grid_size", this.contentType.dataStore.get("grid_size"));
 
@@ -149,7 +154,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
           if (args.id === _this2.contentType.id) {
             _this2.setDefaultGridSizeOnColumnGroup();
 
-            _this2.createColumns();
+            _this2.addDefaultColumnLine(args);
           }
         });
       }
@@ -191,6 +196,33 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
 
         _this3.fireMountEvent(_this3.contentType, columns[0], columns[1]);
       });
+    };
+
+    _proto.addDefaultColumnLine = function addDefaultColumnLine(args) {
+      var _this4 = this;
+
+      (0, _contentTypeFactory)(_config.getContentTypeConfig("column-line"), this.contentType, this.contentType.stageId).then(function (columnLine) {
+        _this4.contentType.addChild(columnLine, 0);
+
+        if (args.columnGroupWithoutColumnLine === undefined) {
+          _events.trigger(columnLine.config.name + ":dropAfter", {
+            id: columnLine.id,
+            columnLine: columnLine
+          });
+        } else {
+          // Move children of this column group without column line as descendant of new
+          // column group that has a column line
+          var children = args.columnGroupWithoutColumnLine.getChildren()();
+          var index = 0;
+          children.forEach(function (child) {
+            setTimeout(function () {
+              (0, _moveContentType.moveContentType)(child, index++, columnLine);
+            }, 250);
+          });
+        }
+
+        _this4.fireMountEvent(_this4.contentType, columnLine);
+      });
     }
     /**
      * Use the conditional remove to disable the option when the content type has a single child
@@ -277,11 +309,11 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     ;
 
     _proto.onNewColumnDrop = function onNewColumnDrop(dropPosition) {
-      var _this4 = this;
+      var _this5 = this;
 
       // Create our new column
       (0, _factory.createColumn)(this.contentType, this.resizeUtils.getSmallestColumnWidth(), dropPosition.insertIndex).then(function () {
-        var newWidth = _this4.resizeUtils.getAcceptedColumnWidth((_this4.resizeUtils.getColumnWidth(dropPosition.affectedColumn) - _this4.resizeUtils.getSmallestColumnWidth()).toString()); // Reduce the affected columns width by the smallest column width
+        var newWidth = _this5.resizeUtils.getAcceptedColumnWidth((_this5.resizeUtils.getColumnWidth(dropPosition.affectedColumn) - _this5.resizeUtils.getSmallestColumnWidth()).toString()); // Reduce the affected columns width by the smallest column width
 
 
         (0, _resize.updateColumnWidth)(dropPosition.affectedColumn, newWidth);
@@ -371,6 +403,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     }
     /**
      * Init the drop placeholder
+     * @deprecated - dropPlaceholder functionality moved to column-line
      *
      * @param {Element} element
      */
@@ -401,39 +434,39 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     }
     /**
      * Register a resize handle within a child column
-     *
+     * @deprecated
      * @param {ContentTypeCollectionInterface<ColumnPreview>} column
      * @param {JQuery} handle
      */
     ;
 
     _proto.registerResizeHandle = function registerResizeHandle(column, handle) {
-      var _this5 = this;
+      var _this6 = this;
 
       handle.off("mousedown touchstart");
       handle.on("mousedown touchstart", function (event) {
         event.preventDefault();
 
-        var groupPosition = _this5.getGroupPosition(_this5.groupElement);
+        var groupPosition = _this6.getGroupPosition(_this6.groupElement);
 
-        _this5.resizing(true);
+        _this6.resizing(true);
 
-        _this5.resizeColumnInstance = column;
-        _this5.resizeColumnWidths = _this5.resizeUtils.determineColumnWidths(_this5.resizeColumnInstance, groupPosition);
-        _this5.resizeMaxGhostWidth = (0, _resize.determineMaxGhostWidth)(_this5.resizeColumnWidths); // Force the cursor to resizing
+        _this6.resizeColumnInstance = column;
+        _this6.resizeColumnWidths = _this6.resizeUtils.determineColumnWidths(_this6.resizeColumnInstance, groupPosition);
+        _this6.resizeMaxGhostWidth = (0, _resize.determineMaxGhostWidth)(_this6.resizeColumnWidths); // Force the cursor to resizing
 
         (0, _jquery)("body").css("cursor", "col-resize"); // Reset the resize history
 
-        _this5.resizeHistory = {
+        _this6.resizeHistory = {
           left: [],
           right: []
         };
-        _this5.resizeLastPosition = null;
-        _this5.resizeMouseDown = true;
-        ++_this5.interactionLevel;
+        _this6.resizeLastPosition = null;
+        _this6.resizeMouseDown = true;
+        ++_this6.interactionLevel;
 
         _events.trigger("stage:interactionStart", {
-          stageId: _this5.contentType.stageId
+          stageId: _this6.contentType.stageId
         });
       });
     }
@@ -445,7 +478,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     ;
 
     _proto.bindDraggable = function bindDraggable(column) {
-      var _this6 = this;
+      var _this7 = this;
 
       column.preview.element.draggable({
         appendTo: "body",
@@ -470,46 +503,44 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
 
 
           (0, _registry2.setDragColumn)(columnInstance.contentType);
-          _this6.dropPositions = (0, _dragAndDrop.calculateDropPositions)(_this6.contentType);
-          _this6.startDragEvent = event;
+          _this7.dropPositions = (0, _dragAndDrop.calculateDropPositions)(_this7.contentType);
+          _this7.startDragEvent = event;
 
           _events.trigger("column:dragStart", {
             column: columnInstance,
-            stageId: _this6.contentType.stageId
+            stageId: _this7.contentType.stageId
           });
 
           _events.trigger("stage:interactionStart", {
-            stageId: _this6.contentType.stageId
+            stageId: _this7.contentType.stageId
           });
         },
         stop: function stop() {
           var draggedColumn = (0, _registry2.getDragColumn)();
 
-          if (_this6.movePosition && draggedColumn) {
+          if (_this7.movePosition && draggedColumn) {
             // Check if we're moving within the same group, even though this function will
             // only ever run on the group that bound the draggable event
-            if (draggedColumn.parentContentType === _this6.contentType) {
-              _this6.onColumnSort(draggedColumn, _this6.movePosition.insertIndex);
+            if (draggedColumn.parentContentType === _this7.contentType) {
+              _this7.onColumnSort(draggedColumn, _this7.movePosition.insertIndex);
 
-              _this6.movePosition = null;
+              _this7.movePosition = null;
             }
           }
 
           (0, _registry2.removeDragColumn)();
 
-          _this6.dropPlaceholder.removeClass("left right");
-
-          _this6.movePlaceholder.removeClass("active");
+          _this7.movePlaceholder.removeClass("active");
 
-          _this6.startDragEvent = null;
+          _this7.startDragEvent = null;
 
           _events.trigger("column:dragStop", {
             column: draggedColumn,
-            stageId: _this6.contentType.stageId
+            stageId: _this7.contentType.stageId
           });
 
           _events.trigger("stage:interactionStop", {
-            stageId: _this6.contentType.stageId
+            stageId: _this7.contentType.stageId
           });
         }
       });
@@ -520,7 +551,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     ;
 
     _proto.updateGridSize = function updateGridSize() {
-      var _this7 = this;
+      var _this8 = this;
 
       if (!_jquery.isNumeric(this.gridSizeInput())) {
         this.gridSizeError((0, _translate)("Please enter a valid number."));
@@ -538,7 +569,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
             this.gridChange(true);
 
             _underscore.delay(function () {
-              _this7.gridChange(false);
+              _this8.gridChange(false);
             }, 1000);
           } catch (e) {
             if (e instanceof _gridSize.GridSizeError) {
@@ -552,6 +583,76 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
         }
       }
     }
+    /**
+     * @param {ContentTypeInterface | ContentTypeCollectionInterface} contentType
+     * @private
+     */
+    ;
+
+    _proto.hasColumnLine = function hasColumnLine(contentType) {
+      var children = this.contentType.getChildren()();
+      var hasColumnLine = false;
+
+      if (children.length === 0 && (0, _checkStageFullScreen)(contentType.stageId)) {
+        // new column group, so it has a column line
+        hasColumnLine = true;
+      }
+
+      children.forEach(function (child) {
+        if (child.config.name === "column-line") {
+          hasColumnLine = true;
+        }
+      });
+      return hasColumnLine;
+    }
+    /**
+     * If the column group does not have a column line, move contents to a new column group with a column line
+     */
+    ;
+
+    _proto.moveContentsToNewColumnGroup = function moveContentsToNewColumnGroup() {
+      var _this9 = this;
+
+      if (this.hasColumnLine(this.contentType)) {
+        // This column-group already has a column line. Don't need to add one.
+        return;
+      }
+
+      var indexToInsertNewColumnGroupAt = this.getCurrentIndexInParent();
+      (0, _contentTypeFactory)(_config.getContentTypeConfig("column-group"), this.contentType.parentContentType, this.contentType.stageId).then(function (columnGroup) {
+        _this9.contentType.parentContentType.addChild(columnGroup, indexToInsertNewColumnGroupAt);
+
+        _events.trigger(columnGroup.config.name + ":dropAfter", {
+          id: columnGroup.id,
+          columnGroup: columnGroup,
+          columnGroupWithoutColumnLine: _this9.contentType
+        });
+
+        _this9.fireMountEvent(_this9.contentType, columnGroup);
+      });
+    }
+    /**
+     * @private return index of current content type in parent
+     */
+    ;
+
+    _proto.getCurrentIndexInParent = function getCurrentIndexInParent() {
+      var parentContentType = this.contentType.parentContentType;
+      var currentIndex = 0;
+
+      for (var _iterator = _createForOfIteratorHelperLoose(this.contentType.parentContentType.getChildren()()), _step; !(_step = _iterator()).done;) {
+        var sibling = _step.value;
+
+        if (sibling.id !== this.contentType.id) {
+          currentIndex++;
+          continue;
+        }
+
+        break;
+      }
+
+      return currentIndex;
+    }
     /**
      * Fire the mount event for content types
      *
@@ -628,11 +729,10 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
       this.resizing(false);
       this.resizeMouseDown = null;
       this.resizeLeftLastColumnShrunk = this.resizeRightLastColumnShrunk = null;
-      this.dropPositions = [];
-      this.unsetResizingColumns(); // Change the cursor back
+      this.dropPositions = []; // this.unsetResizingColumns();
+      // Change the cursor back
 
       (0, _jquery)("body").css("cursor", "");
-      this.dropPlaceholder.removeClass("left right");
       this.movePlaceholder.css("left", "").removeClass("active");
       this.resizeGhost.removeClass("active"); // Reset the group positions cache
 
@@ -646,7 +746,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     ;
 
     _proto.initMouseMove = function initMouseMove(group) {
-      var _this8 = this;
+      var _this10 = this;
 
       var intersects = false;
       (0, _jquery)(document).on("mousemove touchmove", function (event) {
@@ -654,7 +754,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
           return;
         }
 
-        var groupPosition = _this8.getGroupPosition(group); // If we're handling a touch event we need to pass through the page X & Y
+        var groupPosition = _this10.getGroupPosition(group); // If we're handling a touch event we need to pass through the page X & Y
 
 
         if (event.type === "touchmove") {
@@ -662,32 +762,22 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
           event.pageY = event.originalEvent.pageY;
         }
 
-        if (_this8.eventIntersectsGroup(event, groupPosition)) {
-          intersects = true;
-
-          _this8.onResizingMouseMove(event, group, groupPosition);
-
-          _this8.onDraggingMouseMove(event, group, groupPosition);
+        if (_this10.eventIntersectsGroup(event, groupPosition)) {
+          intersects = true; // @todo make column re-sizing work
 
-          _this8.onDroppingMouseMove(event, group, groupPosition);
+          _this10.onResizingMouseMove(event, group, groupPosition);
         } else {
           intersects = false;
-          _this8.groupPositionCache = null;
-          _this8.dropPosition = null;
+          _this10.groupPositionCache = null;
+          _this10.dropPosition = null;
 
-          _this8.dropPlaceholder.removeClass("left right");
-
-          _this8.movePlaceholder.css("left", "").removeClass("active");
+          _this10.movePlaceholder.css("left", "").removeClass("active");
         }
       }).on("mouseup touchend", function () {
-        if (intersects) {
-          _this8.handleMouseUp();
-        }
-
         intersects = false;
-        _this8.dropPosition = null;
+        _this10.dropPosition = null;
 
-        _this8.endAllInteractions();
+        _this10.endAllInteractions();
 
         _underscore.defer(function () {
           // Re-enable any disabled sortable areas
@@ -701,6 +791,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     }
     /**
      * Handle the mouse up action, either adding a new column or moving an existing
+     * @deprecated
      */
     ;
 
@@ -786,7 +877,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     ;
 
     _proto.onResizingMouseMove = function onResizingMouseMove(event, group, groupPosition) {
-      var _this9 = this;
+      var _this11 = this;
 
       var newColumnWidth;
 
@@ -846,8 +937,8 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
 
               _underscore.defer(function () {
                 // If we do a resize, re-calculate the column widths
-                _this9.resizeColumnWidths = _this9.resizeUtils.determineColumnWidths(_this9.resizeColumnInstance, groupPosition);
-                _this9.resizeMaxGhostWidth = (0, _resize.determineMaxGhostWidth)(_this9.resizeColumnWidths);
+                _this11.resizeColumnWidths = _this11.resizeUtils.determineColumnWidths(_this11.resizeColumnInstance, groupPosition);
+                _this11.resizeMaxGhostWidth = (0, _resize.determineMaxGhostWidth)(_this11.resizeColumnWidths);
               });
             }
           }
@@ -856,7 +947,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     }
     /**
      * Handle a column being dragged around the group
-     *
+     * @deprecated - this is now handled in column-line/preview onDraggingMouseMove
      * @param {JQueryEventObject} event
      * @param {JQuery} group
      * @param {GroupPositionCache} groupPosition
@@ -888,7 +979,6 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
           }
 
           if (this.movePosition) {
-            this.dropPlaceholder.removeClass("left right");
             this.movePlaceholder.css({
               left: this.movePosition.placement === "left" ? this.movePosition.left : "",
               right: this.movePosition.placement === "right" ? groupPosition.width - this.movePosition.right : "",
@@ -906,13 +996,6 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
           if (this.movePosition) {
             var classToRemove = this.movePosition.placement === "left" ? "right" : "left";
             this.movePlaceholder.removeClass("active");
-            this.dropPlaceholder.removeClass(classToRemove).css({
-              left: this.movePosition.placement === "left" ? this.movePosition.left : "",
-              right: this.movePosition.placement === "right" ? groupPosition.width - this.movePosition.right : "",
-              width: groupPosition.width / this.resizeUtils.getGridSize() + "px"
-            }).addClass(this.movePosition.placement);
-          } else {
-            this.dropPlaceholder.removeClass("left right");
           }
         }
       }
@@ -923,6 +1006,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
      * @param {JQueryEventObject} event
      * @param {JQuery} group
      * @param {GroupPositionCache} groupPosition
+     * @deprecated now handled in column-line/preview
      */
     ;
 
@@ -939,14 +1023,6 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
         this.dropPosition = this.dropPositions.find(function (position) {
           return currentX > position.left && currentX <= position.right && position.canShrink;
         });
-
-        if (this.dropPosition) {
-          this.dropPlaceholder.removeClass("left right").css({
-            left: this.dropPosition.placement === "left" ? this.dropPosition.left : "",
-            right: this.dropPosition.placement === "right" ? groupPosition.width - this.dropPosition.right : "",
-            width: groupPosition.width / this.resizeUtils.getGridSize() + "px"
-          }).addClass(this.dropPosition.placement);
-        }
       } else if (this.dropOverElement) {
         // Re-enable the column group sortable instance
         if (elementChildrenParent.data("ui-sortable")) {
@@ -954,7 +1030,6 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
         }
 
         this.dropPosition = null;
-        this.dropPlaceholder.removeClass("left right");
       }
     }
     /**
@@ -970,7 +1045,6 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
       group.droppable({
         deactivate: function deactivate() {
           self.dropOverElement = null;
-          self.dropPlaceholder.removeClass("left right");
 
           _underscore.defer(function () {
             // Re-enable the column group sortable instance & all children sortable instances
@@ -1003,17 +1077,14 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
         },
         drop: function drop() {
           self.dropPositions = [];
-          self.dropPlaceholder.removeClass("left right");
         },
         out: function out() {
           self.dropOverElement = null;
-          self.dropPlaceholder.removeClass("left right");
         },
         over: function over() {
           // Is the element currently being dragged a column group?
           if ((0, _registry.getDraggedContentTypeConfig)() === _config.getContentTypeConfig("column-group")) {
             // Always calculate drop positions when an element is dragged over
-            self.dropPositions = (0, _dragAndDrop.calculateDropPositions)(self.contentType);
             self.dropOverElement = true;
           } else {
             self.dropOverElement = null;
@@ -1048,8 +1119,8 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
       for (var _i = totalChildColumns; _i > 0; _i--) {
         var potentialWidth = Math.floor(formattedAvailableWidth / _i);
 
-        for (var _iterator = _createForOfIteratorHelperLoose(allowedColumnWidths), _step; !(_step = _iterator()).done;) {
-          var width = _step.value;
+        for (var _iterator2 = _createForOfIteratorHelperLoose(allowedColumnWidths), _step2; !(_step2 = _iterator2()).done;) {
+          var width = _step2.value;
 
           if (potentialWidth === Math.floor(width)) {
             spreadAcross = _i;
@@ -1099,15 +1170,41 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/content-
     ;
 
     _proto.recordGridResize = function recordGridResize(newGridSize) {
-      var _this10 = this;
+      var _this12 = this;
+
+      // @todo evaluate utility of having a grid size history
+      return;
 
       if (!this.gridSizeHistory.has(newGridSize)) {
         var columnWidths = [];
         this.contentType.getChildren()().forEach(function (column) {
-          columnWidths.push(_this10.resizeUtils.getColumnWidth(column));
+          columnWidths.push(_this12.resizeUtils.getColumnWidth(column));
         });
         this.gridSizeHistory.set(newGridSize, columnWidths);
       }
+    }
+    /**
+     * Figure out the maximum number of non-empty columns in various column lines
+     * @private
+     */
+    ;
+
+    _proto.getNonEmptyColumnCount = function getNonEmptyColumnCount() {
+      var nonEmptyColumnCount = 0;
+      this.contentType.getChildren()().forEach(function (columnLine, index) {
+        var numEmptyColumns = 0;
+        var numCols = columnLine.getChildren()().length;
+        columnLine.getChildren()().forEach(function (column) {
+          if (column.getChildren()().length === 0) {
+            numEmptyColumns++;
+          }
+        });
+
+        if (numCols - numEmptyColumns > nonEmptyColumnCount) {
+          nonEmptyColumnCount = numCols - numEmptyColumns;
+        }
+      });
+      return nonEmptyColumnCount;
     };
 
     return Preview;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-line/drag-and-drop.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-line/drag-and-drop.js
new file mode 100644
index 00000000000..11af0acd51b
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-line/drag-and-drop.js
@@ -0,0 +1,45 @@
+/*eslint-disable */
+/* jscs:disable */
+define([], function () {
+  /**
+   * Copyright © Magento, Inc. All rights reserved.
+   * See COPYING.txt for license details.
+   */
+
+  /**
+   * Calculate the drop positions of a column group
+   *
+   * @param {ContentTypeCollectionInterface} group
+   * @returns {any[]}
+   */
+  function calculateDropPositions(line) {
+    var resizeUtils = line.preview.getResizeUtils();
+    var dropPositions = [];
+    line.children().forEach(function (column, index) {
+      var left = column.preview.element.position().left;
+      var width = column.preview.element.outerWidth(true);
+      var canShrink = resizeUtils.getAcceptedColumnWidth(resizeUtils.getColumnWidth(column).toString()) > resizeUtils.getSmallestColumnWidth();
+      dropPositions.push({
+        affectedColumn: column,
+        canShrink: canShrink,
+        insertIndex: index,
+        left: left,
+        placement: "left",
+        right: left + width / 2
+      }, {
+        affectedColumn: column,
+        canShrink: canShrink,
+        insertIndex: index + 1,
+        left: left + width / 2,
+        placement: "right",
+        right: left + width
+      });
+    });
+    return dropPositions;
+  }
+
+  return {
+    calculateDropPositions: calculateDropPositions
+  };
+});
+//# sourceMappingURL=drag-and-drop.js.map
\ No newline at end of file
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-line/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-line/preview.js
new file mode 100644
index 00000000000..4254f324316
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column-line/preview.js
@@ -0,0 +1,1208 @@
+/*eslint-disable */
+/* jscs:disable */
+
+function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+define(["jquery", "knockout", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/content-type/column-group/factory", "Magento_PageBuilder/js/content-type/column-group/registry", "Magento_PageBuilder/js/drag-drop/move-content-type", "Magento_PageBuilder/js/drag-drop/registry", "Magento_PageBuilder/js/drag-drop/sortable", "Magento_PageBuilder/js/events", "Magento_PageBuilder/js/utils/create-stylesheet", "underscore", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column/resize", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column-line/drag-and-drop"], function (_jquery, _knockout, _contentTypeFactory, _factory, _registry, _moveContentType, _registry2, _sortable, _events, _createStylesheet, _underscore, _config, _gridSize, _resize, _previewCollection, _dragAndDrop) {
+  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+  /**
+   * Copyright © Magento, Inc. All rights reserved.
+   * See COPYING.txt for license details.
+   */
+
+  /**
+   * @api
+   */
+  var Preview = /*#__PURE__*/function (_previewCollection2) {
+    "use strict";
+
+    _inheritsLoose(Preview, _previewCollection2);
+
+    /**
+     *
+     * @param {ContentTypeCollection} contentType
+     * @param {ContentTypeConfigInterface} config
+     * @param {ObservableUpdater} observableUpdater
+     */
+    function Preview(contentType, config, observableUpdater) {
+      var _this;
+
+      _this = _previewCollection2.call(this, contentType, config, observableUpdater) || this;
+      _this.resizing = _knockout.observable(false);
+      _this.gridSizeArray = _knockout.observableArray([]);
+      _this.dropPositions = [];
+      _this.resizeHistory = {
+        left: [],
+        right: []
+      };
+      _this.interactionLevel = 0;
+      _this.lineDropperHeight = 50;
+      _this.resizeUtils = new _resize(_this.contentType.parentContentType, _this.contentType);
+
+      _events.on("contentType:removeAfter", function (args) {
+        if (args.parentContentType && args.parentContentType.id === _this.contentType.id) {
+          _underscore.defer(function () {
+            _this.spreadWidth(args.index);
+          });
+        }
+      }); // Listen for resizing events from child columns
+
+
+      _events.on("column:resizeHandleBindAfter", function (args) {
+        // Does the events content type match the previews column group?
+        if (args.columnLine.id === _this.contentType.id) {
+          _this.registerResizeHandle(args.column, args.handle);
+        }
+      });
+
+      _events.on("column:initializeAfter", function (args) {
+        // Does the events parent match the previews column group?
+        if (args.columnGroup.id === _this.contentType.id) {
+          _this.bindDraggable(args.column);
+        }
+      });
+
+      var parentPreview = _this.contentType.parentContentType.preview;
+
+      _this.gridSizeArray(parentPreview.gridSizeArray());
+
+      parentPreview.gridSizeArray.subscribe(function (gridSize) {
+        _this.gridSizeArray(gridSize);
+      });
+
+      _this.contentType.children.subscribe(_underscore.debounce(_this.removeIfEmpty.bind(_assertThisInitialized(_this)), 50));
+
+      return _this;
+    }
+    /**
+     * Bind events
+     */
+
+
+    var _proto = Preview.prototype;
+
+    _proto.bindEvents = function bindEvents() {
+      var _this2 = this;
+
+      _previewCollection2.prototype.bindEvents.call(this);
+
+      if (_config.getContentTypeConfig("column")) {
+        _events.on("column-line:dropAfter", function (args) {
+          if (args.id === _this2.contentType.id) {
+            _this2.createColumns();
+          }
+        });
+      }
+
+      _events.on("column:initializeAfter", function (args) {
+        // Does the events parent match the previews column group?
+        if (args.columnLine.id === _this2.contentType.id) {
+          _this2.bindDraggable(args.column);
+        }
+      });
+    }
+    /**
+     * Init the droppable & resizing interactions
+     *
+     * @param line
+     */
+    ;
+
+    _proto.bindInteractions = function bindInteractions(line) {
+      this.element = (0, _jquery)(line);
+      this.initDroppable(this.element);
+      this.initMouseMove(this.element); // Handle the mouse leaving the window
+      //  $("body").mouseleave(this.endAllInteractions.bind(this));
+    }
+    /**
+     * Init the drop placeholder
+     *
+     * @param {Element} element
+     */
+    ;
+
+    _proto.bindDropPlaceholder = function bindDropPlaceholder(element) {
+      this.dropPlaceholder = (0, _jquery)(element);
+    }
+    /**
+     * Init the drop placeholder
+     *
+     * @param {Element} element
+     */
+    ;
+
+    _proto.bindColumnLineBottomDropPlaceholder = function bindColumnLineBottomDropPlaceholder(element) {
+      this.columnLineBottomDropPlaceholder = (0, _jquery)(element);
+    }
+    /**
+     * Init the drop placeholder
+     *
+     * @param {Element} element
+     */
+    ;
+
+    _proto.bindColumnLineDropPlaceholder = function bindColumnLineDropPlaceholder(element) {
+      this.columnLineDropPlaceholder = (0, _jquery)(element);
+    }
+    /**
+     * Init the move placeholder
+     *
+     * @param {Element} element
+     */
+    ;
+
+    _proto.bindMovePlaceholder = function bindMovePlaceholder(element) {
+      this.movePlaceholder = (0, _jquery)(element);
+    }
+    /**
+     * Retrieve the ghost element from the template
+     *
+     * @param {Element} ghost
+     */
+    ;
+
+    _proto.bindGhost = function bindGhost(ghost) {
+      this.resizeGhost = (0, _jquery)(ghost);
+    }
+    /**
+     * Retrieve the resize utils
+     *
+     * @returns {Resize}
+     */
+    ;
+
+    _proto.getResizeUtils = function getResizeUtils() {
+      return this.resizeUtils;
+    }
+    /**
+     * Bind draggable instances to the child columns
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     */
+    ;
+
+    _proto.bindDraggable = function bindDraggable(column) {
+      var _this3 = this;
+
+      column.preview.element.draggable({
+        appendTo: "body",
+        containment: "body",
+        cursor: "-webkit-grabbing",
+        handle: ".move-column",
+        revertDuration: 250,
+        helper: function helper() {
+          var helper = (0, _jquery)(this).clone();
+          helper.css({
+            height: (0, _jquery)(this).outerHeight() + "px",
+            minHeight: 0,
+            opacity: 0.5,
+            pointerEvents: "none",
+            width: (0, _jquery)(this).outerWidth() + "px",
+            zIndex: 5000
+          });
+          return helper;
+        },
+        start: function start(event) {
+          var columnInstance = _knockout.dataFor((0, _jquery)(event.target)[0]); // Use the global state as columns can be dragged between groups
+
+
+          (0, _registry.setDragColumn)(columnInstance.contentType);
+          _this3.dropPositions = (0, _dragAndDrop.calculateDropPositions)(_this3.contentType);
+          _this3.startDragEvent = event;
+
+          _events.trigger("column:dragStart", {
+            column: columnInstance,
+            stageId: _this3.contentType.stageId
+          });
+
+          _events.trigger("stage:interactionStart", {
+            stageId: _this3.contentType.stageId
+          });
+        },
+        stop: function stop() {
+          var draggedColumn = (0, _registry.getDragColumn)();
+
+          if (_this3.movePosition && draggedColumn) {
+            // Check if we're moving within the same group, even though this function will
+            // only ever run on the group that bound the draggable event
+            if (draggedColumn.parentContentType === _this3.contentType) {
+              _this3.onColumnSort(draggedColumn, _this3.movePosition.insertIndex);
+
+              _this3.movePosition = null; // todo see from column group
+            }
+          }
+
+          (0, _registry.removeDragColumn)();
+
+          _this3.dropPlaceholder.removeClass("left right");
+
+          _this3.movePlaceholder.removeClass("active");
+
+          _this3.movePosition = null;
+          _this3.startDragEvent = null;
+
+          _events.trigger("column:dragStop", {
+            column: draggedColumn,
+            stageId: _this3.contentType.stageId
+          });
+
+          _events.trigger("stage:interactionStop", {
+            stageId: _this3.contentType.stageId
+          });
+        }
+      });
+    }
+    /**
+     * Handle a column being sorted into a new position in the column line
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @param {number} newIndex
+     */
+    ;
+
+    _proto.onColumnSort = function onColumnSort(column, newIndex) {
+      var currentIndex = (0, _resize.getColumnIndexInLine)(column);
+
+      if (currentIndex !== newIndex) {
+        if (currentIndex < newIndex) {
+          // As we're moving an array item the keys all reduce by 1
+          --newIndex;
+        } // Move the content type
+
+
+        (0, _moveContentType.moveContentType)(column, newIndex);
+      }
+    }
+    /**
+     * Handle a new column being dropped into the group
+     *
+     * @param {DropPosition} dropPosition
+     */
+    ;
+
+    _proto.onNewColumnDrop = function onNewColumnDrop(dropPosition) {
+      var _this4 = this;
+
+      // Create our new column
+      (0, _factory.createColumn)(this.contentType, this.resizeUtils.getSmallestColumnWidth(), dropPosition.insertIndex).then(function () {
+        var newWidth = _this4.resizeUtils.getAcceptedColumnWidth((_this4.resizeUtils.getColumnWidth(dropPosition.affectedColumn) - _this4.resizeUtils.getSmallestColumnWidth()).toString()); // Reduce the affected columns width by the smallest column width
+
+
+        (0, _resize.updateColumnWidth)(dropPosition.affectedColumn, newWidth);
+      });
+    }
+    /**
+     * Handle an existing column being dropped into a different column line
+     *
+     * @param {DropPosition} movePosition
+     */
+    ;
+
+    _proto.onExistingColumnDrop = function onExistingColumnDrop(movePosition) {
+      var _this5 = this;
+
+      var column = (0, _registry.getDragColumn)();
+      var sourceLinePreview = column.parentContentType.preview;
+      var modifyOldNeighbour; // Determine which old neighbour we should modify
+
+      var oldWidth = sourceLinePreview.getResizeUtils().getColumnWidth(column);
+      var direction = "+1"; // Retrieve the adjacent column either +1 or -1
+
+      if ((0, _resize.getAdjacentColumn)(column, "+1")) {
+        modifyOldNeighbour = (0, _resize.getAdjacentColumn)(column, "+1");
+      } else if ((0, _resize.getAdjacentColumn)(column, "-1")) {
+        direction = "-1";
+        modifyOldNeighbour = (0, _resize.getAdjacentColumn)(column, "-1");
+      } // Modify the old neighbour
+
+
+      var oldNeighbourWidth = 100;
+
+      if (modifyOldNeighbour) {
+        oldNeighbourWidth = sourceLinePreview.getResizeUtils().getAcceptedColumnWidth((oldWidth + sourceLinePreview.getResizeUtils().getColumnWidth(modifyOldNeighbour)).toString());
+      } // Move the content type
+
+
+      if (this.columnLineDropPlaceholder.hasClass("active")) {
+        // if new column line placeholders are visible, add new column line and move column there
+        (0, _factory.createColumnLine)(this.contentType.parentContentType, this.resizeUtils.getSmallestColumnWidth(), this.getNewColumnLineIndex()).then(function (columnLine) {
+          (0, _moveContentType.moveContentType)(column, 0, columnLine);
+          (0, _resize.updateColumnWidth)(column, 100);
+
+          if (modifyOldNeighbour) {
+            (0, _resize.updateColumnWidth)(modifyOldNeighbour, oldNeighbourWidth);
+          }
+
+          _this5.fireMountEvent(_this5.contentType, column);
+        });
+      } else if (this.columnLineBottomDropPlaceholder.hasClass("active")) {
+        // if new column line placeholders are visible, add new column line and move column there
+        (0, _factory.createColumnLine)(this.contentType.parentContentType, this.resizeUtils.getSmallestColumnWidth(), this.getNewColumnLineIndex()).then(function (columnLine) {
+          (0, _moveContentType.moveContentType)(column, 0, columnLine);
+          (0, _resize.updateColumnWidth)(column, 100);
+
+          if (modifyOldNeighbour) {
+            (0, _resize.updateColumnWidth)(modifyOldNeighbour, oldNeighbourWidth);
+          }
+
+          _this5.fireMountEvent(_this5.contentType, column);
+        });
+      } else {
+        (0, _moveContentType.moveContentType)(column, movePosition.insertIndex, this.contentType);
+
+        if (modifyOldNeighbour) {
+          (0, _resize.updateColumnWidth)(modifyOldNeighbour, oldNeighbourWidth);
+        }
+
+        var newNeighbourWidth = this.resizeUtils.getAcceptedColumnWidth((this.resizeUtils.getColumnWidth(movePosition.affectedColumn) - oldWidth).toString());
+        var newNeighbour = movePosition.affectedColumn;
+        var totalWidthAdjusted = 0;
+        (0, _resize.updateColumnWidth)(column, oldWidth);
+
+        while (true) {
+          // take width from all neighbours in one direction till the entire width is obtained
+          if (newNeighbourWidth <= 0) {
+            newNeighbourWidth = this.resizeUtils.getSmallestColumnWidth();
+            var originalWidthOfNeighbour = this.resizeUtils.getColumnWidth(newNeighbour);
+            (0, _resize.updateColumnWidth)(newNeighbour, newNeighbourWidth);
+            totalWidthAdjusted += originalWidthOfNeighbour - newNeighbourWidth;
+          } else {
+            (0, _resize.updateColumnWidth)(newNeighbour, newNeighbourWidth);
+            break;
+          }
+
+          if (direction === "+1") {
+            newNeighbour = (0, _resize.getAdjacentColumn)(newNeighbour, "+1");
+          } else {
+            newNeighbour = (0, _resize.getAdjacentColumn)(newNeighbour, "-1");
+          }
+
+          if (!newNeighbour) {
+            (0, _resize.updateColumnWidth)(column, totalWidthAdjusted);
+            break;
+          }
+
+          var neighbourExistingWidth = this.resizeUtils.getColumnWidth(newNeighbour);
+          newNeighbourWidth = neighbourExistingWidth - (oldWidth - totalWidthAdjusted);
+
+          if (newNeighbourWidth < 0.001) {
+            newNeighbourWidth = 0;
+          }
+        }
+
+        var totalWidth = 0;
+        this.contentType.children().forEach(function (columnChild) {
+          totalWidth += _this5.resizeUtils.getColumnWidth(columnChild);
+        });
+
+        if (totalWidth > 100) {
+          // take extra width from newly moved column
+          (0, _resize.updateColumnWidth)(column, this.resizeUtils.getColumnWidth(column) - (totalWidth - 100));
+        }
+      }
+    }
+    /**
+     * Init the resizing events on the group
+     *
+     * @param {JQuery} line
+     */
+    ;
+
+    _proto.initMouseMove = function initMouseMove(line) {
+      var _this6 = this;
+
+      var intersects = false;
+      (0, _jquery)(document).on("mousemove touchmove", function (event) {
+        if (line.parents(_sortable.hiddenClass).length > 0) {
+          return;
+        }
+
+        var linePosition = _this6.getLinePosition(line); // If we're handling a touch event we need to pass through the page X & Y
+
+
+        if (event.type === "touchmove") {
+          event.pageX = event.originalEvent.pageX;
+          event.pageY = event.originalEvent.pageY;
+        }
+
+        if (_this6.eventIntersectsLine(event, linePosition)) {
+          intersects = true; // @todo re-instate onResizingMouseMove
+
+          _this6.onResizingMouseMove(event, line, linePosition);
+
+          _this6.onDraggingMouseMove(event, line, linePosition);
+
+          _this6.onDroppingMouseMove(event, line, linePosition);
+        } else {
+          intersects = false;
+          _this6.linePositionCache = null;
+          _this6.dropPosition = null;
+
+          _this6.dropPlaceholder.removeClass("left right");
+
+          _this6.columnLineDropPlaceholder.removeClass("active");
+
+          _this6.columnLineBottomDropPlaceholder.removeClass("active");
+
+          _this6.columnLineBottomDropPlaceholder.hide();
+
+          _this6.columnLineDropPlaceholder.hide(); // @todo combine active and show/hide functionality for columnLineDropPlaceholder
+          //  this.movePlaceholder.css("left", "").removeClass("active");
+
+        }
+      }).on("mouseup touchend", function () {
+        if (intersects) {
+          _this6.handleMouseUp();
+        }
+
+        intersects = false;
+        _this6.dropPosition = null;
+
+        _this6.endAllInteractions();
+
+        _underscore.defer(function () {
+          // Re-enable any disabled sortable areas
+          line.find(".ui-sortable").each(function () {
+            if ((0, _jquery)(this).data("ui-sortable")) {
+              (0, _jquery)(this).sortable("option", "disabled", false);
+            }
+          });
+        });
+      });
+    }
+    /**
+     * End all current interactions
+     */
+    ;
+
+    _proto.endAllInteractions = function endAllInteractions() {
+      if (this.resizing() === true) {
+        for (; this.interactionLevel > 0; this.interactionLevel--) {
+          _events.trigger("stage:interactionStop", {
+            stageId: this.contentType.stageId
+          });
+        }
+      }
+
+      this.linePositionCache = null;
+      this.dropPosition = null;
+      this.dropPlaceholder.removeClass("left right");
+      this.columnLineDropPlaceholder.removeClass("active");
+      this.columnLineBottomDropPlaceholder.removeClass("active");
+      this.columnLineBottomDropPlaceholder.hide();
+      this.columnLineDropPlaceholder.hide();
+      this.resizing(false);
+      this.resizeMouseDown = null;
+      this.resizeLeftLastColumnShrunk = this.resizeRightLastColumnShrunk = null;
+      this.dropPositions = [];
+      this.unsetResizingColumns(); // Change the cursor back
+
+      (0, _jquery)("body").css("cursor", "");
+      this.movePlaceholder.css("left", "").removeClass("active");
+      this.resizeGhost.removeClass("active"); // Reset the line positions cache
+
+      this.linePositionCache = null;
+    }
+    /**
+     * Handle the mouse up action, either adding a new column or moving an existing
+     */
+    ;
+
+    _proto.handleMouseUp = function handleMouseUp() {
+      var self = this;
+      var dragColumn = (0, _registry.getDragColumn)();
+
+      if ((this.columnLineDropPlaceholder.hasClass("active") || this.columnLineBottomDropPlaceholder.hasClass("active")) && !dragColumn) {
+        (0, _factory.createColumnLine)(this.contentType.parentContentType, this.resizeUtils.getSmallestColumnWidth(), this.getNewColumnLineIndex()).then(function (columnLine) {
+          _events.trigger(columnLine.config.name + ":dropAfter", {
+            id: columnLine.id,
+            columnLine: columnLine
+          });
+        });
+        return;
+      }
+
+      if (this.dropOverElement && this.dropPosition) {
+        this.onNewColumnDrop(this.dropPosition);
+        this.dropOverElement = null; // Re-enable the parent disabled sortable instance
+
+        _underscore.defer(function () {
+          (0, _jquery)(".element-children.ui-sortable-disabled").each(function () {
+            (0, _jquery)(this).sortable("option", "disabled", false);
+          });
+        });
+      }
+
+      var column = (0, _registry.getDragColumn)();
+
+      if (this.isColumnBeingMovedToAnotherColumnLine()) {
+        this.onExistingColumnDrop(this.movePosition);
+      }
+    }
+    /**
+     * Does the current event intersect with the line?
+     *
+     * @param {JQueryEventObject} event
+     * @param {LinePositionCache} groupPosition
+     * @returns {boolean}
+     */
+    ;
+
+    _proto.eventIntersectsLine = function eventIntersectsLine(event, groupPosition) {
+      return event.pageY > groupPosition.top && event.pageY < groupPosition.top + groupPosition.outerHeight && event.pageX > groupPosition.left && event.pageX < groupPosition.left + groupPosition.outerWidth;
+    }
+    /**
+     * Handle a column being dragged around the group
+     *
+     * @param {JQueryEventObject} event
+     * @param {JQuery} line
+     * @param {LinePositionCache} linePosition
+     */
+    ;
+
+    _proto.onDraggingMouseMove = function onDraggingMouseMove(event, line, linePosition) {
+      var dragColumn = (0, _registry.getDragColumn)();
+
+      if (dragColumn) {
+        // If the drop positions haven't been calculated for this line do so now
+        if (this.dropPositions.length === 0) {
+          this.dropPositions = (0, _dragAndDrop.calculateDropPositions)(this.contentType);
+        }
+
+        var columnInstance = dragColumn;
+        var currentX = event.pageX - linePosition.left; // Are we within the same column line or have we ended up over another?
+
+        if (columnInstance.parentContentType === this.contentType && this.startDragEvent) {
+          var dragDirection = event.pageX <= this.startDragEvent.pageX ? "left" : "right";
+          var adjacentLeftColumn = (0, _resize.getAdjacentColumn)(dragColumn, "-1"); // Determine the current move position based on the cursors position and direction of drag
+
+          this.movePosition = this.dropPositions.find(function (position) {
+            return currentX > position.left && currentX < position.right && position.placement === dragDirection && position.affectedColumn !== dragColumn;
+          }); // Differences in the element & event positions cause a right movement to activate on the left column
+
+          if (this.movePosition && dragDirection === "right" && this.movePosition.affectedColumn === adjacentLeftColumn) {
+            this.movePosition = null;
+          }
+
+          if (this.movePosition && !this.isNewLinePlaceDropPlaceholderVisible(event, linePosition) && !this.isNewLineBottomPlaceDropPlaceholderVisible(event, linePosition)) {
+            this.dropPlaceholder.removeClass("left right");
+            this.movePlaceholder.css({
+              left: this.movePosition.placement === "left" ? this.movePosition.left : "",
+              right: this.movePosition.placement === "right" ? linePosition.width - this.movePosition.right : "",
+              width: dragColumn.preview.element.outerWidth() + "px"
+            }).addClass("active");
+          } else {
+            this.movePlaceholder.removeClass("active");
+          }
+        } else {
+          // If we're moving to another column line we utilise the existing drop placeholder
+          this.movePosition = this.dropPositions.find(function (position) {
+            return currentX > position.left && currentX <= position.right && position.canShrink;
+          });
+
+          if (this.movePosition && !this.isNewLinePlaceDropPlaceholderVisible(event, linePosition)) {
+            var classToRemove = this.movePosition.placement === "left" ? "right" : "left";
+            this.movePlaceholder.removeClass("active");
+            this.dropPlaceholder.removeClass(classToRemove).css({
+              left: this.movePosition.placement === "left" ? this.movePosition.left : "",
+              right: this.movePosition.placement === "right" ? linePosition.width - this.movePosition.right : "",
+              width: linePosition.width / this.resizeUtils.getGridSize() + "px"
+            }).addClass(this.movePosition.placement);
+          } else {
+            this.dropPlaceholder.removeClass("left right");
+          }
+        }
+      }
+    }
+    /**
+     * Handle the resizing on mouse move, we always resize a pair of columns at once
+     *
+     * @param {JQueryEventObject} event
+     * @param {JQuery} group
+     * @param {GroupPositionCache} groupPosition
+     */
+    ;
+
+    _proto.onResizingMouseMove = function onResizingMouseMove(event, group, groupPosition) {
+      var _this7 = this;
+
+      var newColumnWidth;
+
+      if (this.resizeMouseDown) {
+        event.preventDefault();
+        var currentPos = event.pageX;
+        var resizeColumnLeft = this.resizeColumnInstance.preview.element.offset().left;
+        var resizeColumnWidth = this.resizeColumnInstance.preview.element.outerWidth();
+        var resizeHandlePosition = resizeColumnLeft + resizeColumnWidth;
+        var direction = currentPos >= resizeHandlePosition ? "right" : "left";
+        var adjustedColumn;
+        var modifyColumnInPair; // We need to know if we're modifying the left or right column in the pair
+
+        var usedHistory; // Was the adjusted column pulled from history?
+        // Determine which column in the group should be adjusted for this action
+
+        var _this$resizeUtils$det = this.resizeUtils.determineAdjustedColumn(currentPos, this.resizeColumnInstance, this.resizeHistory);
+
+        adjustedColumn = _this$resizeUtils$det[0];
+        modifyColumnInPair = _this$resizeUtils$det[1];
+        usedHistory = _this$resizeUtils$det[2];
+        // Calculate the ghost width based on mouse position and bounds of allowed sizes
+        var ghostWidth = this.resizeUtils.calculateGhostWidth(groupPosition, currentPos, this.resizeColumnInstance, modifyColumnInPair, this.resizeMaxGhostWidth);
+        this.resizeGhost.width(ghostWidth - 15 + "px").addClass("active");
+
+        if (adjustedColumn && this.resizeColumnWidths) {
+          newColumnWidth = this.resizeColumnWidths.find(function (val) {
+            return (0, _resize.comparator)(currentPos, val.position, 35) && val.forColumn === modifyColumnInPair;
+          });
+
+          if (newColumnWidth) {
+            var mainColumn = this.resizeColumnInstance; // If we're using the left data set, we're actually resizing the right column of the group
+
+            if (modifyColumnInPair === "right") {
+              mainColumn = (0, _resize.getAdjacentColumn)(this.resizeColumnInstance, "+1");
+            } // Ensure we aren't resizing multiple times, also validate the last resize isn't the same as the
+            // one being performed now. This occurs as we re-calculate the column positions on resize, we have
+            // to use the comparator as the calculation may result in slightly different numbers due to rounding
+
+
+            if (this.resizeUtils.getColumnWidth(mainColumn) !== newColumnWidth.width && !(0, _resize.comparator)(this.resizeLastPosition, newColumnWidth.position, 10)) {
+              // If our previous action was to resize the right column in pair, and we're now dragging back
+              // to the right, but have matched a column for the left we need to fix the columns being
+              // affected
+              if (usedHistory && this.resizeLastColumnInPair === "right" && direction === "right" && newColumnWidth.forColumn === "left") {
+                var originalMainColumn = mainColumn;
+                mainColumn = adjustedColumn;
+                adjustedColumn = (0, _resize.getAdjacentColumn)(originalMainColumn, "+1");
+              }
+
+              this.recordResizeHistory(usedHistory, direction, adjustedColumn, modifyColumnInPair);
+              this.resizeLastPosition = newColumnWidth.position;
+              this.resizeLastColumnInPair = modifyColumnInPair; // Ensure the adjusted column is marked as resizing to animate correctly
+
+              this.setColumnsAsResizing(mainColumn, adjustedColumn);
+              this.onColumnResize(mainColumn, newColumnWidth.width, adjustedColumn); // Wait for the render cycle to finish from the above resize before re-calculating
+
+              _underscore.defer(function () {
+                // If we do a resize, re-calculate the column widths
+                _this7.resizeColumnWidths = _this7.resizeUtils.determineColumnWidths(_this7.resizeColumnInstance, groupPosition);
+                _this7.resizeMaxGhostWidth = (0, _resize.determineMaxGhostWidth)(_this7.resizeColumnWidths);
+              });
+            }
+          }
+        }
+      }
+    }
+    /**
+     * Unset resizing flag on all child columns
+     */
+    ;
+
+    _proto.unsetResizingColumns = function unsetResizingColumns() {
+      this.contentType.children().forEach(function (column) {
+        column.preview.resizing(false);
+
+        if (column.preview.element) {
+          column.preview.element.css({
+            transition: ""
+          });
+        }
+      });
+    }
+    /**
+     *
+     * @param event
+     * @param linePosition
+     * @private
+     */
+    ;
+
+    _proto.isNewLinePlaceDropPlaceholderVisible = function isNewLinePlaceDropPlaceholderVisible(event, linePosition) {
+      var siblings = this.contentType.parentContentType.children();
+      var id = this.contentType.id;
+      var index = 0;
+      siblings.forEach(function (columnLine) {
+        if (columnLine.id === id) {
+          return false;
+        }
+
+        index++;
+      });
+      var draggedColumn = (0, _registry.getDragColumn)(); // show column line drop placeholder only for top column line in a group
+
+      return (this.dropOverElement || draggedColumn) && event.pageY > linePosition.top + 15 && event.pageY < linePosition.top + 15 + this.lineDropperHeight;
+    }
+    /**
+     *
+     * @param event
+     * @param linePosition
+     * @private
+     */
+    ;
+
+    _proto.isNewLineBottomPlaceDropPlaceholderVisible = function isNewLineBottomPlaceDropPlaceholderVisible(event, linePosition) {
+      var draggedColumn = (0, _registry.getDragColumn)();
+      return (this.dropOverElement || draggedColumn) && event.pageY < linePosition.top + 15 + this.element.outerHeight() && event.pageY > linePosition.top + 15 + this.element.outerHeight() - this.lineDropperHeight;
+    }
+    /**
+     *
+     * @param event
+     * @param linePosition
+     * @private
+     */
+    ;
+
+    _proto.isNewColumnDropPlaceholderVisible = function isNewColumnDropPlaceholderVisible(event, linePosition) {
+      var draggedColumn = (0, _registry.getDragColumn)();
+      return (this.dropOverElement || draggedColumn) && event.pageY > linePosition.top + 15 + this.lineDropperHeight && event.pageY < linePosition.top + 15 + linePosition.outerHeight - this.lineDropperHeight;
+    }
+    /**
+     * Handle mouse move events on when dropping elements
+     *
+     * @param {JQueryEventObject} event
+     * @param {JQuery} line
+     * @param {LinePositionCache} linePosition
+     */
+    ;
+
+    _proto.onDroppingMouseMove = function onDroppingMouseMove(event, line, linePosition) {
+      var elementChildrenParent = line.parents(".element-children"); // Only initiate this process if we're within the group by a buffer to allow for sortable to function correctly
+
+      if (this.isNewLinePlaceDropPlaceholderVisible(event, linePosition)) {
+        this.dropPosition = null;
+        this.dropPlaceholder.removeClass("left right");
+        this.columnLineDropPlaceholder.addClass("active");
+        this.columnLineDropPlaceholder.show();
+        return this.handleLineDropMouseMove(event, line, linePosition);
+      } else if (this.isNewLineBottomPlaceDropPlaceholderVisible(event, linePosition)) {
+        this.dropPosition = null;
+        this.dropPlaceholder.removeClass("left right");
+        this.columnLineBottomDropPlaceholder.addClass("active");
+        this.columnLineBottomDropPlaceholder.show();
+        return this.handleLineDropMouseMove(event, line, linePosition);
+      } else if (this.dropOverElement) {
+        this.columnLineDropPlaceholder.hide();
+        this.columnLineBottomDropPlaceholder.hide();
+        this.columnLineBottomDropPlaceholder.removeClass("active");
+        this.columnLineDropPlaceholder.removeClass("active");
+      }
+
+      if (this.isNewColumnDropPlaceholderVisible(event, linePosition)) {
+        this.columnLineDropPlaceholder.hide();
+        this.columnLineDropPlaceholder.removeClass("active");
+        this.columnLineBottomDropPlaceholder.hide();
+        this.columnLineBottomDropPlaceholder.removeClass("active");
+        return this.handleColumnDropMouseMove(event, line, linePosition);
+      }
+    }
+    /**
+     *
+     * @param event
+     * @param line
+     * @param linePosition
+     * @private
+     */
+    ;
+
+    _proto.handleLineDropMouseMove = function handleLineDropMouseMove(event, line, linePosition) {
+      var elementChildrenParent = line.parents(".element-children"); // Disable the column line sortable instance
+      // Disable the column group sortable instance
+
+      if (elementChildrenParent.data("ui-sortable")) {
+        elementChildrenParent.sortable("option", "disabled", true);
+      }
+    }
+    /**
+     *
+     * @param event
+     * @param line
+     * @param linePosition
+     * @private
+     */
+    ;
+
+    _proto.handleColumnDropMouseMove = function handleColumnDropMouseMove(event, line, linePosition) {
+      var elementChildrenParent = line.parents(".element-children"); // Only initiate this process if we're within the group by a buffer to allow for sortable to function correctly
+
+      if (this.dropOverElement && event.pageY > linePosition.top + 50 && event.pageY < linePosition.top + linePosition.outerHeight - 50) {
+        // Disable the column line sortable instance
+        if (elementChildrenParent.data("ui-sortable")) {
+          elementChildrenParent.sortable("option", "disabled", true);
+        }
+
+        var currentX = event.pageX - linePosition.left;
+        this.dropPosition = this.dropPositions.find(function (position) {
+          return currentX > position.left && currentX <= position.right && position.canShrink;
+        });
+
+        if (this.dropPosition) {
+          this.dropPlaceholder.removeClass("left right").css({
+            left: this.dropPosition.placement === "left" ? this.dropPosition.left : "",
+            right: this.dropPosition.placement === "right" ? linePosition.width - this.dropPosition.right : "",
+            width: linePosition.width / this.resizeUtils.getGridSize() + "px"
+          }).addClass(this.dropPosition.placement);
+        }
+      } else if (this.dropOverElement) {
+        // Re-enable the column group sortable instance
+        if (elementChildrenParent.data("ui-sortable")) {
+          elementChildrenParent.sortable("option", "disabled", false);
+        }
+
+        this.dropPosition = null;
+        this.dropPlaceholder.removeClass("left right");
+      }
+    }
+    /**
+     * Cache the groups positions
+     *
+     * @param {JQuery} line
+     * @returns {}
+     */
+    ;
+
+    _proto.getLinePosition = function getLinePosition(line) {
+      if (!this.linePositionCache) {
+        this.linePositionCache = {
+          top: line.offset().top,
+          left: line.offset().left,
+          width: line.width(),
+          height: line.height(),
+          outerWidth: line.outerWidth(),
+          outerHeight: line.outerHeight()
+        };
+      }
+
+      return this.linePositionCache;
+    }
+    /**
+     * Init the droppable functionality for new columns
+     *
+     * @param {JQuery} line
+     */
+    ;
+
+    _proto.initDroppable = function initDroppable(line) {
+      var self = this;
+      var headStyles;
+      line.droppable({
+        deactivate: function deactivate() {
+          self.dropOverElement = null;
+          self.dropPlaceholder.removeClass("left right");
+
+          _underscore.defer(function () {
+            // Re-enable the column group sortable instance & all children sortable instances
+            line.parents(".element-children").each(function () {
+              if ((0, _jquery)(this).data("ui-sortable")) {
+                (0, _jquery)(this).sortable("option", "disabled", false);
+              }
+            });
+          });
+        },
+        activate: function activate() {
+          if ((0, _registry2.getDraggedContentTypeConfig)() === _config.getContentTypeConfig("column-group")) {
+            var _ref;
+
+            line.find(".ui-sortable").each(function () {
+              if ((0, _jquery)(this).data("ui-sortable")) {
+                (0, _jquery)(this).sortable("option", "disabled", true);
+              }
+            });
+            var classes = [".pagebuilder-content-type.pagebuilder-column .pagebuilder-drop-indicator", ".pagebuilder-content-type.pagebuilder-column .empty-container .content-type-container:before"]; // Ensure we don't display any drop indicators inside the column
+
+            headStyles = (0, _createStylesheet.createStyleSheet)((_ref = {}, _ref[classes.join(", ")] = {
+              display: "none!important"
+            }, _ref));
+            document.head.appendChild(headStyles);
+          } else if (headStyles) {
+            headStyles.remove();
+            headStyles = null;
+          }
+        },
+        drop: function drop() {
+          self.dropPositions = [];
+          self.dropPlaceholder.removeClass("left right");
+        },
+        out: function out() {
+          self.dropOverElement = null;
+          self.dropPlaceholder.removeClass("left right");
+        },
+        over: function over() {
+          // Is the element currently being dragged a column group?
+          if ((0, _registry2.getDraggedContentTypeConfig)() === _config.getContentTypeConfig("column-group") || (0, _registry2.getDraggedContentTypeConfig)() === _config.getContentTypeConfig("column")) {
+            // Always calculate drop positions when an element is dragged over
+            var ownContentType = self.contentType;
+            self.dropPositions = (0, _dragAndDrop.calculateDropPositions)(ownContentType);
+            self.dropOverElement = true;
+          } else {
+            self.dropOverElement = null;
+          }
+        }
+      });
+    }
+    /**
+     * Spread any empty space across the other columns when a column is removed
+     *
+     * @param {number} removedIndex
+     */
+    ;
+
+    _proto.spreadWidth = function spreadWidth(removedIndex) {
+      if (this.contentType.children().length === 0) {
+        return;
+      }
+
+      var availableWidth = 100 - this.resizeUtils.getColumnsWidth();
+      var formattedAvailableWidth = (0, _resize.getRoundedColumnWidth)(availableWidth);
+      var totalChildColumns = this.contentType.children().length;
+      var allowedColumnWidths = [];
+      var spreadAcross = 1;
+      var spreadAmount;
+
+      for (var i = this.resizeUtils.getGridSize(); i > 0; i--) {
+        allowedColumnWidths.push((0, _resize.getRoundedColumnWidth)(100 / this.resizeUtils.getGridSize() * i));
+      } // Determine how we can spread the empty space across the columns
+
+
+      for (var _i = totalChildColumns; _i > 0; _i--) {
+        var potentialWidth = Math.floor(formattedAvailableWidth / _i);
+
+        for (var _iterator = _createForOfIteratorHelperLoose(allowedColumnWidths), _step; !(_step = _iterator()).done;) {
+          var width = _step.value;
+
+          if (potentialWidth === Math.floor(width)) {
+            spreadAcross = _i;
+            spreadAmount = formattedAvailableWidth / _i;
+            break;
+          }
+        }
+
+        if (spreadAmount) {
+          break;
+        }
+      } // Let's spread the width across the columns
+
+
+      for (var _i2 = 1; _i2 <= spreadAcross; _i2++) {
+        var columnToModify = void 0; // As the original column has been removed from the array, check the new index for a column
+
+        if (removedIndex <= this.contentType.children().length && typeof this.contentType.children()[removedIndex] !== "undefined") {
+          columnToModify = this.contentType.children()[removedIndex];
+        }
+
+        if (!columnToModify && removedIndex - _i2 >= 0 && typeof this.contentType.children()[removedIndex - _i2] !== "undefined") {
+          columnToModify = this.contentType.children()[removedIndex - _i2];
+        }
+
+        if (columnToModify) {
+          (0, _resize.updateColumnWidth)(columnToModify, this.resizeUtils.getColumnWidth(columnToModify) + spreadAmount);
+        }
+      }
+    }
+    /**
+     * Register a resize handle within a child column
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @param {JQuery} handle
+     */
+    ;
+
+    _proto.registerResizeHandle = function registerResizeHandle(column, handle) {
+      var _this8 = this;
+
+      handle.off("mousedown touchstart");
+      handle.on("mousedown touchstart", function (event) {
+        event.preventDefault();
+
+        var groupPosition = _this8.getLinePosition(_this8.element);
+
+        _this8.resizing(true); // @ts-ignore
+
+
+        _this8.resizeColumnInstance = column;
+        _this8.resizeColumnWidths = _this8.resizeUtils.determineColumnWidths(_this8.resizeColumnInstance, groupPosition);
+        _this8.resizeMaxGhostWidth = (0, _resize.determineMaxGhostWidth)(_this8.resizeColumnWidths); // Force the cursor to resizing
+
+        (0, _jquery)("body").css("cursor", "col-resize"); // Reset the resize history
+
+        _this8.resizeHistory = {
+          left: [],
+          right: []
+        };
+        _this8.resizeLastPosition = null;
+        _this8.resizeMouseDown = true;
+        ++_this8.interactionLevel;
+
+        _events.trigger("stage:interactionStart", {
+          stageId: _this8.contentType.stageId
+        });
+      });
+    }
+    /**
+     * Add Columns to the current Column Line
+     *
+     * @returns {Promise<ContentTypeCollectionInterface>}
+     */
+    ;
+
+    _proto.createColumns = function createColumns() {
+      var _this9 = this;
+
+      var defaultGridSize = (0, _gridSize.getDefaultGridSize)();
+      var col1Width = (Math.ceil(defaultGridSize / 2) * 100 / defaultGridSize).toFixed(Math.round(100 / defaultGridSize) !== 100 / defaultGridSize ? 8 : 0);
+      Promise.all([(0, _contentTypeFactory)(_config.getContentTypeConfig("column"), this.contentType, this.contentType.stageId, {
+        width: col1Width + "%"
+      }), (0, _contentTypeFactory)(_config.getContentTypeConfig("column"), this.contentType, this.contentType.stageId, {
+        width: 100 - parseFloat(col1Width) + "%"
+      })]).then(function (columns) {
+        _this9.contentType.addChild(columns[0], 0);
+
+        _this9.contentType.addChild(columns[1], 1);
+
+        _this9.fireMountEvent(_this9.contentType, columns[0], columns[1]);
+      });
+    }
+    /**
+     * Record the resizing history for this action
+     *
+     * @param {string} usedHistory
+     * @param {string} direction
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} adjustedColumn
+     * @param {string} modifyColumnInPair
+     */
+    ;
+
+    _proto.recordResizeHistory = function recordResizeHistory(usedHistory, direction, adjustedColumn, modifyColumnInPair) {
+      if (usedHistory) {
+        this.resizeHistory[usedHistory].pop();
+      }
+
+      this.resizeHistory[direction].push({
+        adjustedColumn: adjustedColumn,
+        modifyColumnInPair: modifyColumnInPair
+      });
+    }
+    /**
+     * Set columns in the group as resizing
+     *
+     * @param {Array<ContentTypeCollectionInterface<ColumnPreview>>} columns
+     */
+    ;
+
+    _proto.setColumnsAsResizing = function setColumnsAsResizing() {
+      for (var _len = arguments.length, columns = new Array(_len), _key = 0; _key < _len; _key++) {
+        columns[_key] = arguments[_key];
+      }
+
+      columns.forEach(function (column) {
+        column.preview.resizing(true);
+        column.preview.element.css({
+          transition: "width 350ms ease-in-out"
+        });
+      });
+    }
+    /**
+     * Handle a column being resized
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @param {number} width
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} adjustedColumn
+     */
+    ;
+
+    _proto.onColumnResize = function onColumnResize(column, width, adjustedColumn) {
+      this.resizeUtils.resizeColumn(column, width, adjustedColumn);
+    }
+    /**
+     * Fire the mount event for content types
+     *
+     * @param {ContentTypeInterface[]} contentTypes
+     */
+    ;
+
+    _proto.fireMountEvent = function fireMountEvent() {
+      for (var _len2 = arguments.length, contentTypes = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        contentTypes[_key2] = arguments[_key2];
+      }
+
+      contentTypes.forEach(function (contentType) {
+        _events.trigger("contentType:mountAfter", {
+          id: contentType.id,
+          contentType: contentType
+        });
+
+        _events.trigger(contentType.config.name + ":mountAfter", {
+          id: contentType.id,
+          contentType: contentType
+        });
+      });
+    }
+    /**
+     * Remove self if we contain no children
+     */
+    ;
+
+    _proto.removeIfEmpty = function removeIfEmpty() {
+      if (this.contentType.children().length === 0) {
+        this.contentType.parentContentType.removeChild(this.contentType);
+        return;
+      }
+    };
+
+    _proto.getNewColumnLineIndex = function getNewColumnLineIndex() {
+      var index = -1;
+      var self = this;
+
+      for (var _iterator2 = _createForOfIteratorHelperLoose(this.contentType.parentContentType.children()), _step2; !(_step2 = _iterator2()).done;) {
+        var child = _step2.value;
+        index++;
+
+        if (child.id === self.contentType.id) {
+          break;
+        }
+      }
+
+      if (this.columnLineBottomDropPlaceholder.hasClass("active")) {
+        // show the bottom drop placeholder
+        index++;
+      }
+
+      return index;
+    };
+
+    _proto.isColumnBeingMovedToAnotherColumnLine = function isColumnBeingMovedToAnotherColumnLine() {
+      var column = (0, _registry.getDragColumn)();
+
+      if (!column) {
+        // if no move position, column is not being moved.
+        return false;
+      }
+
+      if (column.parentContentType !== this.contentType) {
+        // if the parent content type is not same as this column line, column is being moved to new column line
+        return true;
+      }
+
+      if (column.parentContentType === this.contentType && (this.columnLineDropPlaceholder.hasClass("active") || this.columnLineBottomDropPlaceholder.hasClass("active"))) {
+        // since new column line drop placeholder is visible, column move should introduce a new column line
+        return true;
+      }
+
+      return false;
+    };
+
+    return Preview;
+  }(_previewCollection);
+
+  return Preview;
+});
+//# sourceMappingURL=preview.js.map
\ No newline at end of file
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/preview.js
index 27eb835de7a..4d555d0affa 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/preview.js
@@ -9,7 +9,7 @@ function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.crea
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events", "Magento_Ui/js/modal/alert", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/content-type-menu/option", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column-group/preview", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column/resize"], function (_jquery, _knockout, _translate, _events, _alert, _config, _contentTypeFactory, _option, _gridSize, _preview, _previewCollection, _resize) {
+define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events", "Magento_Ui/js/modal/alert", "Magento_PageBuilder/js/config", "Magento_PageBuilder/js/content-type-factory", "Magento_PageBuilder/js/content-type-menu/option", "Magento_PageBuilder/js/content-type/column-group/grid-size", "Magento_PageBuilder/js/content-type/column-line/preview", "Magento_PageBuilder/js/content-type/preview-collection", "Magento_PageBuilder/js/content-type/column/resize"], function (_jquery, _knockout, _translate, _events, _alert, _config, _contentTypeFactory, _option, _gridSize, _preview, _previewCollection, _resize) {
   /**
    * Copyright © Magento, Inc. All rights reserved.
    * See COPYING.txt for license details.
@@ -92,7 +92,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
       });
 
       _events.on("column:initializeAfter", function (args) {
-        _this2.resetRemoveOnLastColumn(args.columnGroup);
+        _this2.resetRemoveOnLastColumn(args.columnLine);
       });
 
       _events.on("column:dropAfter", function (args) {
@@ -123,7 +123,8 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
       _events.trigger("column:initializeAfter", {
         column: this.contentType,
         element: (0, _jquery)(element),
-        columnGroup: this.contentType.parentContentType
+        columnLine: this.contentType.parentContentType,
+        columnGroup: this.contentType.parentContentType.parentContentType
       });
 
       this.updateDisplayLabel();
@@ -158,7 +159,7 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
       _events.trigger("column:resizeHandleBindAfter", {
         column: this.contentType,
         handle: (0, _jquery)(handle),
-        columnGroup: this.contentType.parentContentType
+        columnLine: this.contentType.parentContentType
       });
     }
     /**
@@ -216,6 +217,24 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
 
       if (contentType.config.name !== "column" || this.contentType.parentContentType.children().length === 0 || this.contentType.parentContentType.children().length > 0 && resizeUtils.getColumnsWidth() < 100) {
         return _previewCollection2.prototype.clone.call(this, contentType, autoAppend);
+      }
+
+      var biggestShrinkableColumn = resizeUtils.findBiggerShrinkableColumn(contentType);
+
+      if (biggestShrinkableColumn) {
+        var shrinkableClone = _previewCollection2.prototype.clone.call(this, contentType, autoAppend);
+
+        if (shrinkableClone) {
+          var newShrinkableColumnWidth = resizeUtils.getColumnWidth(biggestShrinkableColumn) - resizeUtils.getColumnWidth(contentType);
+          var duplicateColumnWidth = resizeUtils.getColumnWidth(contentType);
+          shrinkableClone.then(function (duplicateContentType) {
+            (0, _resize.updateColumnWidth)(biggestShrinkableColumn, resizeUtils.getAcceptedColumnWidth(newShrinkableColumnWidth.toString()));
+            (0, _resize.updateColumnWidth)(duplicateContentType, duplicateColumnWidth);
+            return duplicateContentType;
+          });
+        }
+
+        return;
       } // Attempt to split the current column into parts
 
 
@@ -242,10 +261,10 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
         var shrinkableColumn = resizeUtils.findShrinkableColumn(contentType);
 
         if (shrinkableColumn) {
-          var shrinkableClone = _previewCollection2.prototype.clone.call(this, contentType, autoAppend);
+          var _shrinkableClone = _previewCollection2.prototype.clone.call(this, contentType, autoAppend);
 
-          if (shrinkableClone) {
-            shrinkableClone.then(function (duplicateContentType) {
+          if (_shrinkableClone) {
+            _shrinkableClone.then(function (duplicateContentType) {
               (0, _resize.updateColumnWidth)(shrinkableColumn, resizeUtils.getAcceptedColumnWidth((resizeUtils.getColumnWidth(shrinkableColumn) - resizeUtils.getSmallestColumnWidth()).toString()));
               (0, _resize.updateColumnWidth)(duplicateContentType, resizeUtils.getSmallestColumnWidth());
               return duplicateContentType;
@@ -268,7 +287,9 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
     _proto.updateDisplayLabel = function updateDisplayLabel() {
       if (this.contentType.parentContentType.preview instanceof _preview) {
         var newWidth = parseFloat(this.contentType.dataStore.get("width").toString());
-        var gridSize = this.contentType.parentContentType.preview.gridSize();
+        var grandParent = this.contentType.parentContentType.parentContentType;
+        var columnGroupPreview = grandParent.preview;
+        var gridSize = columnGroupPreview.gridSize();
         var newLabel = Math.round(newWidth / (100 / gridSize)) + "/" + gridSize;
         var columnIndex = this.contentType.parentContentType.children().indexOf(this.contentType);
         var columnNumber = columnIndex !== -1 ? columnIndex + 1 + " " : "";
@@ -287,22 +308,27 @@ define(["jquery", "knockout", "mage/translate", "Magento_PageBuilder/js/events",
         return;
       }
 
-      var siblings = parentContentType.children();
-
-      if (siblings.length < 1) {
-        return;
-      }
-
-      if (siblings.length === 1) {
-        var lastColumn = siblings[0];
-        var options = lastColumn.preview.getOptions();
-        options.getOption("remove").isDisabled(true);
+      if (parentContentType.config.name !== "column-line") {
+        // for legacy content in preview mode before stage is initialized, the parent may not be a column line
         return;
       }
 
-      siblings.forEach(function (column) {
-        var removeOption = column.preview.getOptions().getOption("remove");
-        removeOption.isDisabled(false);
+      var siblings = parentContentType.children();
+      var siblingColumnLines = parentContentType.parentContentType.children();
+      var totalColumnCount = 0;
+      siblingColumnLines.forEach(function (columnLine) {
+        var columns = columnLine.children();
+        columns.forEach(function (column) {
+          totalColumnCount++;
+        });
+      });
+      var isRemoveDisabled = totalColumnCount <= 1;
+      siblingColumnLines.forEach(function (columnLine) {
+        var columns = columnLine.children();
+        columns.forEach(function (column) {
+          var removeOption = column.preview.getOptions().getOption("remove");
+          removeOption.isDisabled(isRemoveDisabled);
+        });
       });
     }
     /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/resize.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/resize.js
index f7fd71ca17f..ea504f31d4a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/resize.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/column/resize.js
@@ -8,8 +8,9 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
   var Resize = /*#__PURE__*/function () {
     "use strict";
 
-    function Resize(columnGroup) {
+    function Resize(columnGroup, columnLine) {
       this.columnGroup = columnGroup;
+      this.columnLine = columnLine;
     }
     /**
      * Get the grid size for this columnGroup
@@ -81,7 +82,7 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
       return this.getAcceptedColumnWidth(column.dataStore.get("width").toString());
     }
     /**
-     * Get the total width of all columns in the group
+     * Get the total width of all columns in the column line
      *
      * @returns {number}
      */
@@ -90,7 +91,7 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
     _proto.getColumnsWidth = function getColumnsWidth() {
       var _this = this;
 
-      return this.getAcceptedColumnWidth(this.columnGroup.children().map(function (column) {
+      return this.getAcceptedColumnWidth(this.columnLine.children().map(function (column) {
         return _this.getColumnWidth(column);
       }).reduce(function (widthA, widthB) {
         return widthA + (widthB ? widthB : 0);
@@ -198,6 +199,21 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
         return _this3.getColumnWidth(neighbourColumn) > _this3.getSmallestColumnWidth();
       });
     }
+    /**
+     * Find a shrinkable column of a greater size outwards from the current column
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @returns {ContentTypeCollectionInterface<ColumnPreview>}
+     */
+    ;
+
+    _proto.findBiggerShrinkableColumn = function findBiggerShrinkableColumn(column) {
+      var _this4 = this;
+
+      return (0, _array.outwardSearch)(column.parentContentType.children(), getColumnIndexInGroup(column), function (neighbourColumn) {
+        return _this4.getColumnWidth(neighbourColumn) > _this4.getColumnWidth(column);
+      });
+    }
     /**
      * Calculate the ghost size for the resizing action
      *
@@ -337,13 +353,13 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
     ;
 
     _proto.gridSupportsResize = function gridSupportsResize(column, newWidth, shrinkableColumn, shrinkableColumnNewWidth) {
-      var _this4 = this;
+      var _this5 = this;
 
       // Determine the total width of all other columns in the grid, excluding the ones we plan to resize
       var otherColumnsWidth = column.parentContentType.getChildren()().filter(function (gridColumn) {
         return gridColumn !== column && shrinkableColumn && gridColumn !== shrinkableColumn;
       }).map(function (otherColumn) {
-        return _this4.getColumnWidth(otherColumn);
+        return _this5.getColumnWidth(otherColumn);
       }).reduce(function (a, b) {
         return a + b;
       }, 0); // Determine if the new total grid size will be 100%, with 1 for margin of error with rounding
@@ -355,7 +371,7 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
   }();
   /**
    * Retrieve the index of the column within it's group
-   *
+   * @deprecated use getColumnIndexInLine
    * @param {ContentTypeCollectionInterface<ColumnPreview>} column
    * @returns {number}
    */
@@ -364,6 +380,17 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
   function getColumnIndexInGroup(column) {
     return column.parentContentType.children().indexOf(column);
   }
+  /**
+   * Retrieve the index of the column within it's column line
+   *
+   * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+   * @returns {number}
+   */
+
+
+  function getColumnIndexInLine(column) {
+    return column.parentContentType.children().indexOf(column);
+  }
   /**
    * Retrieve the adjacent column based on a direction of +1 or -1
    *
@@ -443,6 +470,7 @@ define(["Magento_PageBuilder/js/utils/array"], function (_array) {
 
   return Object.assign(Resize, {
     getColumnIndexInGroup: getColumnIndexInGroup,
+    getColumnIndexInLine: getColumnIndexInLine,
     getAdjacentColumn: getAdjacentColumn,
     determineMaxGhostWidth: determineMaxGhostWidth,
     getRoundedColumnWidth: getRoundedColumnWidth,
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js
index 77c7f4251c3..b684890434f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/image/preview.js
@@ -1,30 +1,23 @@
 /*eslint-disable */
 /* jscs:disable */
-
 function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 define(["Magento_PageBuilder/js/events", "Magento_PageBuilder/js/content-type-menu/hide-show-option", "Magento_PageBuilder/js/uploader", "Magento_PageBuilder/js/content-type/preview"], function (_events, _hideShowOption, _uploader, _preview) {
   /**
    * Copyright © Magento, Inc. All rights reserved.
    * See COPYING.txt for license details.
    */
-
   /**
    * @api
    */
   var Preview = /*#__PURE__*/function (_preview2) {
     "use strict";
 
-    _inheritsLoose(Preview, _preview2);
-
     function Preview() {
       return _preview2.apply(this, arguments) || this;
     }
-
+    _inheritsLoose(Preview, _preview2);
     var _proto = Preview.prototype;
-
     /**
      * Return an array of options
      *
@@ -32,7 +25,6 @@ define(["Magento_PageBuilder/js/events", "Magento_PageBuilder/js/content-type-me
      */
     _proto.retrieveOptions = function retrieveOptions() {
       var options = _preview2.prototype.retrieveOptions.call(this);
-
       options.hideShow = new _hideShowOption({
         preview: this,
         icon: _hideShowOption.showIcon,
@@ -43,71 +35,62 @@ define(["Magento_PageBuilder/js/events", "Magento_PageBuilder/js/content-type-me
       });
       return options;
     }
+
     /**
      * Get registry callback reference to uploader UI component
      *
      * @returns {Uploader}
-     */
-    ;
-
+     */;
     _proto.getUploader = function getUploader() {
       var initialImageValue = this.contentType.dataStore.get(this.config.additional_data.uploaderConfig.dataScope, "");
       return new _uploader("imageuploader_" + this.contentType.id, this.config.additional_data.uploaderConfig, this.contentType.id, this.contentType.dataStore, initialImageValue);
     }
+
     /**
      * Get viewport image data
-     */
-    ;
-
+     */;
     _proto.getViewportImageData = function getViewportImageData() {
       var desktopImageData = this.data.desktop_image;
       var mobileImageData = this.data.mobile_image;
-      return this.viewport() === "mobile" && typeof mobileImageData !== "undefined" ? mobileImageData : desktopImageData;
+      var result = this.viewport() === "mobile" && typeof mobileImageData !== "undefined" ? mobileImageData : desktopImageData;
+      if (result && result.attributes() && result.attributes().src.length > 0 && result.attributes().src.indexOf("?rand") === -1) {
+        result.attributes().src += "?rand=" + Date.now();
+      }
+      return result;
     }
+
     /**
      * @inheritDoc
-     */
-    ;
-
+     */;
     _proto.bindEvents = function bindEvents() {
       var _this = this;
-
       _preview2.prototype.bindEvents.call(this);
-
       _events.on("image:mountAfter", function (args) {
         if (args.id === _this.contentType.id) {
           _this.isSnapshot.subscribe(function (value) {
             _this.changeUploaderControlsVisibility();
           });
-
           _this.changeUploaderControlsVisibility();
         }
       });
-
       _events.on(this.config.name + ":" + this.contentType.id + ":updateAfter", function () {
         var files = _this.contentType.dataStore.get(_this.config.additional_data.uploaderConfig.dataScope);
-
         var imageObject = files ? files[0] : {};
-
         _events.trigger("image:" + _this.contentType.id + ":assignAfter", imageObject);
       });
     }
+
     /**
      * Change uploader controls visibility
-     */
-    ;
-
+     */;
     _proto.changeUploaderControlsVisibility = function changeUploaderControlsVisibility() {
       var _this2 = this;
-
       this.getUploader().getUiComponent()(function (uploader) {
         uploader.visibleControls = !_this2.isSnapshot();
       });
     };
-
     return Preview;
   }(_preview);
-
   return Preview;
 });
-//# sourceMappingURL=preview.js.map
\ No newline at end of file
+//# sourceMappingURL=preview.js.map
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.js
index efb1c68faf5..3748825ccdf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.js
@@ -38,7 +38,7 @@ define(["Magento_PageBuilder/js/mass-converter/widget-directive-abstract", "Mage
       data.carousel_products_count = attributes.products_count;
       data.sort_order = attributes.sort_order;
       data.condition_option = attributes.condition_option || "condition";
-      data[data.condition_option] = this.decodeWysiwygCharacters(attributes.condition_option_value || "");
+      data[data.condition_option] = this.decodeWysiwygCharacters(this.decodeHtmlCharacters(attributes.condition_option_value || ""));
       data.conditions_encoded = this.decodeWysiwygCharacters(attributes.conditions_encoded || "");
       data[data.condition_option + "_source"] = data.conditions_encoded;
       return data;
@@ -98,6 +98,22 @@ define(["Magento_PageBuilder/js/mass-converter/widget-directive-abstract", "Mage
 
     _proto.decodeWysiwygCharacters = function decodeWysiwygCharacters(content) {
       return content.replace(/\^\[/g, "{").replace(/\^\]/g, "}").replace(/`/g, "\"").replace(/\|/g, "\\").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+    }
+    /**
+     * Decode html special characters
+     *
+     * @param {string} content
+     * @returns {string}
+     */
+    ;
+
+    _proto.decodeHtmlCharacters = function decodeHtmlCharacters(content) {
+      if (content) {
+        var htmlDocument = new DOMParser().parseFromString(content, "text/html");
+        return htmlDocument.body ? htmlDocument.body.textContent : content;
+      }
+
+      return content;
     };
 
     return WidgetDirective;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.js
index 92b0f780ba4..e97221fbda1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.js
@@ -38,7 +38,7 @@ define(["Magento_PageBuilder/js/mass-converter/widget-directive-abstract", "Mage
       data.products_count = attributes.products_count;
       data.sort_order = attributes.sort_order;
       data.condition_option = attributes.condition_option || "condition";
-      data[data.condition_option] = this.decodeWysiwygCharacters(attributes.condition_option_value || "");
+      data[data.condition_option] = this.decodeWysiwygCharacters(this.decodeHtmlCharacters(attributes.condition_option_value || ""));
       data.conditions_encoded = this.decodeWysiwygCharacters(attributes.conditions_encoded || "");
       data[data.condition_option + "_source"] = data.conditions_encoded;
       return data;
@@ -98,6 +98,22 @@ define(["Magento_PageBuilder/js/mass-converter/widget-directive-abstract", "Mage
 
     _proto.decodeWysiwygCharacters = function decodeWysiwygCharacters(content) {
       return content.replace(/\^\[/g, "{").replace(/\^\]/g, "}").replace(/`/g, "\"").replace(/\|/g, "\\").replace(/&lt;/g, "<").replace(/&gt;/g, ">");
+    }
+    /**
+     * Decode html special characters
+     *
+     * @param {string} content
+     * @returns {string}
+     */
+    ;
+
+    _proto.decodeHtmlCharacters = function decodeHtmlCharacters(content) {
+      if (content) {
+        var htmlDocument = new DOMParser().parseFromString(content, "text/html");
+        return htmlDocument.body ? htmlDocument.body.textContent : content;
+      }
+
+      return content;
     };
 
     return WidgetDirective;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js
index 3d7419d41da..ab7680e3cfd 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/slide/preview.js
@@ -420,6 +420,14 @@ define(["jarallax", "jarallaxVideo", "jquery", "knockout", "mage/translate", "Ma
     _proto.bindEvents = function bindEvents() {
       var _this8 = this;
 
+      this.contentType.dataStore.subscribe(function (state) {
+        var sanitizedContent = (0, _editor.removeReservedHtmlAttributes)(state.content);
+
+        if (sanitizedContent !== state.content) {
+          state.content = sanitizedContent;
+        }
+      }, "content");
+
       _preview2.prototype.bindEvents.call(this);
 
       _events.on("slide:mountAfter", function (args) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/text/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/text/preview.js
index 298b689548b..4b8a6ea3487 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/text/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/text/preview.js
@@ -135,12 +135,18 @@ define(["jquery", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBu
       }
 
       var wysiwygConfig = this.config.additional_data.wysiwygConfig.wysiwygConfigData;
-      wysiwygConfig.adapter.settings.paste_as_text = true;
 
       if (focus) {
         wysiwygConfig.adapter.settings.auto_focus = this.element.id;
 
-        wysiwygConfig.adapter.settings.init_instance_callback = function () {
+        wysiwygConfig.adapter.settings.init_instance_callback = function (editor) {
+          editor.on("mousedown", function (event) {
+            if (event.target.nodeName === "IMG" && event.button !== 2 && editor.dom.getRoot() !== document.activeElement) {
+              editor.selection.select(event.target);
+              editor.nodeChanged();
+            }
+          });
+
           _underscore.defer(function () {
             _this3.element.blur();
 
@@ -221,13 +227,46 @@ define(["jquery", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBu
         }
       });
     }
+    /**
+     * Handle "mousedown" event
+     *
+     * @param {Preview} preview
+     * @param {JQueryEventObject} event
+     * @returns {Boolean}
+     */
+    ;
+
+    _proto.handleMouseDown = function handleMouseDown(preview, event) {
+      var _this6 = this;
+
+      var handleMouseUp = function handleMouseUp(mouseUpEvent) {
+        if (_this6.element && !_this6.wysiwyg && document.activeElement === _this6.element // Check that mouseup occurred outside the element, otherwise "click" event will be triggerred in which
+        // case we don't need to do anything as the "click" event is handled in "activateEditor"
+        // Note: click is fired after a full click action occurs; that is, the mouse button is pressed
+        // and released while the pointer remains inside the same element.
+        && _this6.element !== mouseUpEvent.target && !_jquery.contains(_this6.element, mouseUpEvent.target)) {
+          _this6.activateEditor(_this6, mouseUpEvent);
+        }
+
+        (0, _jquery)(document).off("mouseup", handleMouseUp);
+        return true;
+      };
+
+      event.stopPropagation();
+
+      if (this.element && !this.wysiwyg) {
+        (0, _jquery)(document).on("mouseup", handleMouseUp);
+      }
+
+      return true;
+    }
     /**
      * @param {HTMLTextAreaElement} element
      */
     ;
 
     _proto.initTextarea = function initTextarea(element) {
-      var _this6 = this;
+      var _this7 = this;
 
       this.textarea = element; // set initial value of textarea based on data store
 
@@ -235,9 +274,9 @@ define(["jquery", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBu
       this.adjustTextareaHeightBasedOnScrollHeight(); // Update content in our stage preview textarea after its slideout counterpart gets updated
 
       _events.on("form:" + this.contentType.id + ":saveAfter", function () {
-        _this6.textarea.value = _this6.contentType.dataStore.get("content");
+        _this7.textarea.value = _this7.contentType.dataStore.get("content");
 
-        _this6.adjustTextareaHeightBasedOnScrollHeight();
+        _this7.adjustTextareaHeightBasedOnScrollHeight();
       });
     }
     /**
@@ -288,23 +327,24 @@ define(["jquery", "Magento_PageBuilder/js/events", "underscore", "Magento_PageBu
     ;
 
     _proto.bindEvents = function bindEvents() {
-      var _this7 = this;
-
-      _preview2.prototype.bindEvents.call(this);
+      var _this8 = this;
 
       this.contentType.dataStore.subscribe(function (state) {
-        var sanitizedContent = (0, _editor.replaceDoubleQuoteWithSingleQuoteWithinVariableDirective)((0, _editor.escapeDoubleQuoteWithinWidgetDirective)(state.content));
+        var sanitizedContent = (0, _editor.removeReservedHtmlAttributes)((0, _editor.replaceDoubleQuoteWithSingleQuoteWithinVariableDirective)((0, _editor.escapeDoubleQuoteWithinWidgetDirective)(state.content)));
 
         if (sanitizedContent !== state.content) {
           state.content = sanitizedContent;
         }
-      }); // After drop of new content type open TinyMCE and focus
+      }, "content");
+
+      _preview2.prototype.bindEvents.call(this); // After drop of new content type open TinyMCE and focus
+
 
       _events.on("text:dropAfter", function (args) {
-        if (args.id === _this7.contentType.id) {
-          _this7.afterRenderDeferred.then(function () {
-            if (_this7.isWysiwygSupported()) {
-              _this7.initWysiwygFromClick(true);
+        if (args.id === _this8.contentType.id) {
+          _this8.afterRenderDeferred.then(function () {
+            if (_this8.isWysiwygSupported()) {
+              _this8.initWysiwygFromClick(true);
             }
           });
         }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/src.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/src.js
index 7c7d4895142..99c33a7ee06 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/src.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/src.js
@@ -44,11 +44,14 @@ define(["Magento_PageBuilder/js/utils/object"], function (_object) {
       }
 
       var youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+      var youtubeNoCookieRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtube-nocookie\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
       var vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" + "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
       var fileRegExp = new RegExp("^(?:https:|http:)?\\/\\/.*[\\\\\\/].+\\.(webm|mp4|ogv)(?!\w)");
 
       if (youtubeRegExp.test(value)) {
         return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1];
+      } else if (youtubeNoCookieRegExp.test(value)) {
+        return "https://www.youtube-nocookie.com/embed/" + youtubeNoCookieRegExp.exec(value)[1];
       } else if (vimeoRegExp.test(value)) {
         return "https://player.vimeo.com/video/" + vimeoRegExp.exec(value)[3] + "?title=0&byline=0&portrait=0";
       } else if (fileRegExp.test(value)) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/videosrc.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/videosrc.js
index 538d355d89a..ed46f525da9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/videosrc.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/converter/attribute/videosrc.js
@@ -10,16 +10,67 @@ define(["Magento_PageBuilder/js/utils/object"], function (_object) {
 
     function VideoSrc() {}
 
-    var _proto = VideoSrc.prototype;
+    /**
+     * Parse YouTube parameters from given URL and Autoplay setting from UI
+     *
+     * @param url string
+     * @param data DataObject
+     * @returns string
+     * @private
+     */
+    VideoSrc.parseYoutubeGetParams = function parseYoutubeGetParams(url, data) {
+      var acceptableYouTubeParams = ["rel", "controls", "autoplay", "mute", "loop", "playlist", "cc_lang_pref", "cc_load_policy", "color", "disablekb", "end", "fs", "hl", "iv_load_policy", "modestbranding", "start"];
+      var a = document.createElement("a");
+      a.href = url;
+      var urlGetParams = {};
+      a.search.slice(a.search.indexOf("?") + 1).split("&").map(function (hash) {
+        var _hash$split = hash.split("="),
+            key = _hash$split[0],
+            val = _hash$split[1];
+
+        urlGetParams[key] = decodeURIComponent(val);
+      });
+      var filteredGetParams = {};
+
+      for (var _i = 0, _acceptableYouTubePar = acceptableYouTubeParams; _i < _acceptableYouTubePar.length; _i++) {
+        var param = _acceptableYouTubePar[_i];
+
+        if (urlGetParams.hasOwnProperty(param)) {
+          filteredGetParams[param] = urlGetParams[param];
+        }
+      }
+
+      if (data.autoplay === "true") {
+        filteredGetParams.autoplay = "1";
+        filteredGetParams.mute = "1";
+      } else {
+        delete filteredGetParams.autoplay;
+        delete filteredGetParams.mute;
+      }
+
+      var processedGetParams = [];
 
+      for (var _param in filteredGetParams) {
+        if (filteredGetParams.hasOwnProperty(_param)) {
+          processedGetParams.push(encodeURI(_param + "=" + filteredGetParams[_param]));
+        }
+      }
+
+      return processedGetParams.length > 0 ? "?" + processedGetParams.join("&") : "";
+    }
     /**
      * Convert value to internal format
      *
      * @param value string
      * @returns {string | object}
      */
+    ;
+
+    var _proto = VideoSrc.prototype;
+
     _proto.fromDom = function fromDom(value) {
       value = value.replace(/\?autoplay=1&mute=1/g, "");
+      value = value.replace(/&autoplay=1&mute=1/g, "");
       value = value.replace(/\?title=0&byline=0&portrait=0/g, "");
       value = value.replace(/&autoplay=1&autopause=0&muted=1/g, "");
       return value;
@@ -41,10 +92,13 @@ define(["Magento_PageBuilder/js/utils/object"], function (_object) {
       }
 
       var youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+      var youtubeNoCookieRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtube-nocookie\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
       var vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" + "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
 
       if (youtubeRegExp.test(value)) {
-        return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1] + (data.autoplay === "true" ? "?autoplay=1&mute=1" : "");
+        return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1] + VideoSrc.parseYoutubeGetParams(value, data);
+      } else if (youtubeNoCookieRegExp.test(value)) {
+        return "https://www.youtube-nocookie.com/embed/" + youtubeNoCookieRegExp.exec(value)[1] + VideoSrc.parseYoutubeGetParams(value, data);
       } else if (vimeoRegExp.test(value)) {
         return "https://player.vimeo.com/video/" + vimeoRegExp.exec(value)[3] + "?title=0&byline=0&portrait=0" + (data.autoplay === "true" ? "&autoplay=1&autopause=0&muted=1" : "");
       }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/master.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/master.js
index 7e0c973fe65..496abce72b0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/master.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/master.js
@@ -22,7 +22,7 @@ define(["Magento_PageBuilder/js/content-type/master"], function (_master) {
     var _proto = Master.prototype;
 
     _proto.isHosted = function isHosted(src) {
-      var youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+      var youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtu\\.be\/|(?:youtube\\.com\/|youtube-nocookie\\.com\/)(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))" + "([\\w-]{11})(?![\\w-])");
       var vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" + "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
       return vimeoRegExp.test(src) || youtubeRegExp.test(src);
     };
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/preview.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/preview.js
index 23884c8c22e..fbc3fa35680 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/preview.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/video/preview.js
@@ -45,7 +45,7 @@ define(["Magento_PageBuilder/js/content-type-menu/hide-show-option", "Magento_Pa
     };
 
     _proto.isHosted = function isHosted(src) {
-      var youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+      var youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" + "(?:youtu\\.be\/|(?:youtube\\.com\/|youtube-nocookie\\.com\/)(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))" + "([\\w-]{11})(?![\\w-])");
       var vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" + "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
       return vimeoRegExp.test(src) || youtubeRegExp.test(src);
     }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/conditions-loader.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/conditions-loader.js
index 3df7e2c64ee..619abad4d31 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/conditions-loader.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/conditions-loader.js
@@ -1,10 +1,14 @@
+/**
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
+ */
 define([
     'jquery',
     'Magento_Rule/rules',
     'uiRegistry',
     'mage/utils/objects'
 ], function ($, RulesForm, uiRegistry, objectUtils) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     return function (config, conditionsFormPlaceholder) {
         var $conditionsFormPlaceholder = $(conditionsFormPlaceholder),
@@ -18,11 +22,28 @@ define([
             data: {
                 conditions: conditions
             }
-        })
-        .done(function (response) {
+        }).done(function (response) {
             $conditionsFormPlaceholder.html(response);
             window[config.jsObjectName] = new RulesForm(config.jsObjectName, config.childComponentUrl);
             $('body').trigger('processStop');
+        }).fail(function (response) {
+            if (response.status === 403) {
+                $('body').notification('clear');
+                $('body').notification('add', {
+                    error: true,
+                    message: $.mage.__(
+                        'Forbidden. You do not have permission to perform this action.'
+                    ),
+                    insertMethod: function (message) {
+                        var $wrapper = $('<div></div>').html(message);
+
+                        $('.page-main-actions').after($wrapper);
+                    }
+                });
+                $('.save.primary').attr('disabled', true);
+                $('body').trigger('processStop');
+            }
+            this.loading(false);
         });
     };
 });
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/file-uploader.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/file-uploader.js
new file mode 100644
index 00000000000..2ff72897d4a
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/file-uploader.js
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+define([
+    'jquery'
+], function ($) {
+    'use strict';
+
+    return function (Element) {
+        return Element.extend({
+
+            /**
+             * {@inheritDoc}
+             */
+            replaceInputTypeFile: function (fileInput) {
+                let fileId = fileInput.id, fileName = fileInput.name, fileClass = fileInput.className,
+                    spanElement = '<span id=\'' + fileId + fileClass + '\' ></span>',
+                    self = this;
+
+                $('#' + fileId).closest('.file-uploader-area').attr('upload-area-id', fileName);
+                $('#' + fileId + fileClass).closest('.file-uploader-area').attr('upload-area-id', fileName);
+
+                $(fileInput).replaceWith(spanElement);
+
+                $('#' + fileId + fileClass)
+                    .closest('.file-uploader-area')
+                    .find('.action-upload-image')
+                    .on('click', function (e) {
+                        let $area = $(this).closest('.file-uploader-area');
+
+                        e.preventDefault();
+                        if (self.triggerFileBrowser) {
+                            self.triggerFileBrowser($area);
+                        } else {
+                            $area.find('.uppy-Dashboard-browse').trigger('click');
+                        }
+                    });
+            }
+        });
+    };
+});
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/html.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/html.js
index 924985fdf7d..cc371c96716 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/html.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/html.js
@@ -59,24 +59,28 @@ define([
                 name;
 
             this.elements.forEach(function (item) {
+                if (!$.contains(document.documentElement, item)) {
+                    // item was removed
+                    return;
+                }
                 switch (item.type) {
-                    case 'checkbox':
-                        result[item.name] = +!!item.checked;
-                        break;
+                case 'checkbox':
+                    result[item.name] = +!!item.checked;
+                    break;
 
-                    case 'radio':
-                        if (item.checked) {
-                            result[item.name] = item.value;
-                        }
-                        break;
+                case 'radio':
+                    if (item.checked) {
+                        result[item.name] = item.value;
+                    }
+                    break;
 
-                    case 'select-multiple':
-                        name = item.name.substring(0, item.name.length - 2); //remove [] from the name ending
-                        result[name] = _.pluck(item.selectedOptions, 'value');
-                        break;
+                case 'select-multiple':
+                    name = item.name.substring(0, item.name.length - 2); //remove [] from the name ending
+                    result[name] = _.pluck(item.selectedOptions, 'value');
+                    break;
 
-                    default:
-                        result[item.name] = item.value;
+                default:
+                    result[item.name] = item.value;
                 }
             });
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js
index 25f3aeaf5c3..dee6aa1dc46 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.js
@@ -80,8 +80,10 @@ define([
          */
         initUploader: function (fileInput) {
             this._super(fileInput);
-            this.$uploadArea = $(this.$fileInput).closest('.pagebuilder-image-empty-preview');
-            new ResizeObserver(this.updateResponsiveClasses.bind(this)).observe(this.$uploadArea.get(0));
+            this.$uploadArea = $('#' + $(fileInput).attr('id')).closest('.pagebuilder-image-empty-preview');
+            if (this.$uploadArea.get(0) !== undefined) {
+                new ResizeObserver(this.updateResponsiveClasses.bind(this)).observe(this.$uploadArea.get(0));
+            }
         },
 
         /**
@@ -120,13 +122,13 @@ define([
 
             if (isInsideDropzone) {
                 $dropzone
-                  .removeClass(this.classes.draggingOutside)
-                  .addClass([this.classes.dragging, this.classes.draggingInside].join(' '));
+                    .removeClass(this.classes.draggingOutside)
+                    .addClass([this.classes.dragging, this.classes.draggingInside].join(' '));
             }
 
             $otherDropzones
-              .removeClass(this.classes.draggingInside)
-              .addClass([this.classes.dragging, this.classes.draggingOutside].join(' '));
+                .removeClass(this.classes.draggingInside)
+                .addClass([this.classes.dragging, this.classes.draggingOutside].join(' '));
         },
 
         /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/product-totals.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/product-totals.js
index 2c9ae558e7c..9e83daadbef 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/product-totals.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/product-totals.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 define([
@@ -10,7 +10,7 @@ define([
     'Magento_PageBuilder/js/form/provider/conditions-data-processor',
     'Magento_Ui/js/form/element/abstract'
 ], function (_, $, $t, conditionsDataProcessor, Abstract) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     return Abstract.extend({
         defaults: {
@@ -62,12 +62,37 @@ define([
          * @param {Object} jqXHR
          */
         callSuperError: function (jqXHR) {
-            // eslint-disable-next-line jquery-no-bind-unbind
+            /* eslint-disable */
             var superError = $.ajaxSettings.error.bind(window, jqXHR);
+            /* eslint-enable */
 
             superError();
         },
 
+        /**
+         * Show upload error message
+         */
+        showForbiddenErrorMessage: function () {
+            let bodyObj = $('body');
+
+            bodyObj.notification('clear');
+            bodyObj.notification('add', {
+                error: true,
+                message: $.mage.__(
+                    'Forbidden. You do not have permission to perform this action.'
+                ),
+
+                /**
+                 * @param {String} message
+                 */
+                insertMethod: function (message) {
+                    let $wrapper = $('<div></div>').html(message);
+
+                    $('.page-main-actions').after($wrapper);
+                }
+            });
+        },
+
         /**
          * Update product count.
          */
@@ -128,7 +153,13 @@ define([
                 this.loading(false);
             }.bind(this)).fail(function () {
                 if (this.jqXHR.statusText !== 'abort') {
-                    this.value($t('An unknown error occurred. Please try again.'));
+                    if (this.jqXHR.status === 403) {
+                        this.showForbiddenErrorMessage();
+                        $('.save.primary').attr('disabled', true);
+                        $('body').trigger('processStop');
+                    } else {
+                        this.value($t('An unknown error occurred. Please try again.'));
+                    }
                 }
                 this.loading(false);
             }.bind(this));
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js
index f69a113bc18..57fccfdb49c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/validator-rules-mixin.js
@@ -67,7 +67,7 @@ define([
      * @return {Boolean}
      */
     function validateCssClass(str) {
-        return (/^[a-zA-Z _\-\d]+$/i).test(str);
+        return (/^[a-zA-Z\d\-_/:.[\]&@()! ]+$/i).test(str);
     }
 
     /**
@@ -193,7 +193,8 @@ define([
 
                 href = (href || '').replace(/^\s+/, '').replace(/\s+$/, '');
 
-                return validateIsUrl(href) && (href.match(/youtube\.com|youtu\.be/) || href.match(/vimeo\.com/));
+                return validateIsUrl(href)
+                    && (href.match(/youtube\.com|youtu\.be|youtube-nocookie\.com/) || href.match(/vimeo\.com/));
             },
             $.mage.__('Please enter a valid video URL.')
         );
@@ -208,7 +209,7 @@ define([
                 href = (href || '').replace(/^\s+/, '').replace(/\s+$/, '');
 
                 return validateIsUrl(href) && (
-                    href.match(/youtube\.com|youtu\.be/) ||
+                    href.match(/youtube\.com|youtu\.be|youtube-nocookie\.com/) ||
                     href.match(/vimeo\.com/) ||
                     href.match(/\.(mp4|ogv|webm)(?!\w)/)
                 );
@@ -234,7 +235,7 @@ define([
                 var allFilled;
 
                 // Validation only for margins and paddings
-                if (typeof value === 'object' && !!(value.padding || value.margin)) {
+                if (value !== null && typeof value === 'object' && !!(value.padding || value.margin)) {
                     allFilled = true;
 
                     _.flatten(_.map(value, _.values)).forEach(function (val) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js
index 2f68cde5868..dc5a97c80fc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/wysiwyg.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 define([
@@ -11,9 +11,10 @@ define([
     'Magento_PageBuilder/js/events',
     'Magento_Ui/js/lib/view/utils/dom-observer',
     'Magento_PageBuilder/js/page-builder',
+    'Magento_Ui/js/modal/alert',
     'Magento_Ui/js/lib/view/utils/async'
-], function ($, _, Wysiwyg, $t, events, domObserver, PageBuilder) {
-    'use strict';
+], function ($, _, Wysiwyg, $t, events, domObserver, PageBuilder, alertDialog) {
+    'use strict'; // eslint-disable-line strict
 
     /**
      * Extend the original WYSIWYG with added PageBuilder functionality
@@ -67,6 +68,15 @@ define([
          * Handle button click, init the Page Builder application
          */
         pageBuilderEditButtonClick: function (context, event) {
+            let aclResource = this.pageBuilder.config && this.pageBuilder.config.acl;
+
+            if (aclResource !== undefined && aclResource.widget === false) {
+                return alertDialog({
+                    content: $t('Sorry, you need permissions to view this content.'),
+                    title: $t('Permission Error')
+                });
+            }
+
             this.determineIfWithinModal(event.currentTarget);
             this.transition(false);
 
@@ -85,9 +95,15 @@ define([
             if (!this.isComponentInitialized()) {
                 this.loading(true);
                 this.pageBuilder = new PageBuilder(
-                  this.wysiwygConfigData(),
-                  this.initialValue
+                    this.wysiwygConfigData(),
+                    this.initialValue
                 );
+                if (!this.source.get('pageBuilderInstances')) {
+                    this.source.set('pageBuilderInstances', []);
+                }
+                // Register PageBuilder instance in the data provider in case the event "pagebuilder:register"
+                // is triggered before the subscribers are registered
+                this.source.get('pageBuilderInstances').push(this.pageBuilder);
                 events.trigger('pagebuilder:register', {
                     ns: this.ns,
                     instance: this.pageBuilder
@@ -131,7 +147,26 @@ define([
                 editableValue = this.pageBuilder.isFullScreen();
 
             editable.attr('contenteditable', editableValue);
-            $(pageBuilderSelector + focusableSelector).attr('tabindex', tabIndexValue);
+            if (this.pageBuilder.isFullScreen()) {
+                $(pageBuilderSelector + focusableSelector)
+                    .each(function () {
+                        if ($(this).data('original-tabindex')) {
+                            $(this).attr('tabindex', $(this).data('original-tabindex'));
+                        } else if ($(this).data('original-tabindex') === '') {
+                            $(this).removeAttr('tabindex');
+                        }
+                        $(this).removeData('original-tabindex');
+                    });
+            } else {
+                $(pageBuilderSelector + focusableSelector).each(function () {
+                    if ($(this).attr('tabindex')) {
+                        $(this).data('original-tabindex', $(this).attr('tabindex'));
+                    } else {
+                        $(this).data('original-tabindex', '');
+                    }
+                    $(this).attr('tabindex', '-1');
+                });
+            }
             $(mediaSelector).attr('tabindex', tabIndexValue);
         },
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/form-mixin.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/form-mixin.js
index 82d385e0225..6386d580cd6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/form-mixin.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/form-mixin.js
@@ -12,10 +12,6 @@ define([
     'use strict';
 
     var mixin = {
-        defaults: {
-            pageBuilderInstances: []
-        },
-
         /**
          * Record instances of Page Builder initialized in the forms namespace
          */
@@ -24,9 +20,18 @@ define([
 
             this._super();
 
+            if (!this.source.get('pageBuilderInstances')) {
+                this.source.set('pageBuilderInstances', []);
+            }
+
             events.on('pagebuilder:register', function (data) {
+                var instance;
+
                 if (data.ns === self.ns) {
-                    self.pageBuilderInstances.push(data.instance);
+                    instance = _.findWhere(self.source.get('pageBuilderInstances'), {id: data.instance.id});
+                    if (!instance) {
+                        self.source.get('pageBuilderInstances').push(data.instance);
+                    }
                 }
             });
 
@@ -44,7 +49,7 @@ define([
                 timeout,
                 locks;
 
-            if (_.isEmpty(this.pageBuilderInstances)) {
+            if (_.isEmpty(this.source.get('pageBuilderInstances'))) {
                 submit();
             } else {
                 timeout = setTimeout(function () {
@@ -56,7 +61,7 @@ define([
                 // Wait for all rendering locks within Page Builder stages to resolve
                 $.when.apply(
                     null,
-                    this.pageBuilderInstances.map(function (instance) {
+                    this.source.get('pageBuilderInstances').map(function (instance) {
                         locks = instance.stage.renderingLocks;
 
                         return locks[locks.length - 1];
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider.js
index 88aaa8afdd8..399440ab531 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider.js
@@ -5,8 +5,9 @@
 
 define([
     'Magento_Ui/js/form/provider',
-    'Magento_PageBuilder/js/events'
-], function (Provider, events) {
+    'Magento_PageBuilder/js/events',
+    'jquery'
+], function (Provider, events, $) {
     'use strict';
 
     return Provider.extend({
@@ -18,8 +19,42 @@ define([
         /** @inheritdoc **/
         save: function () {
             events.trigger('form:' + this.id + ':saveAfter', this.get('data'));
+            this._refreshSlickOnSave();
 
             return this;
+        },
+
+        /**
+         * Refresh slick slide of parent window
+         *
+         * @private
+         */
+        _refreshSlickOnSave: function () {
+            let slickObj = $('.slick-list.draggable'),
+                parentSlick,
+                currentSettings;
+
+            if (slickObj.length === 0) {
+                return;
+            }
+
+            parentSlick = slickObj.parent();
+
+            if (typeof parentSlick.slick !== 'function') {
+                return;
+            }
+
+            currentSettings = parentSlick.slick('getSlick').options;
+
+            if (!currentSettings.infinite) {
+                return;
+            }
+
+            if (currentSettings.rows > 0) {
+                parentSlick.slick('slickSetOption', 'rows', 0);
+            }
+
+            parentSlick.slick('refresh');
         }
     });
 });
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js
index b73292469b7..a6c2feaaff8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js
@@ -236,7 +236,7 @@ define(["mage/translate", "Magento_PageBuilder/js/events", "Magento_Ui/js/modal/
           if (child.hasAttribute(_config.getConfig("dataContentTypeAttributeName"))) {
             children.push(child);
           } else {
-            children = getElementChildren(child);
+            children.push(...getElementChildren(child));
           }
         }
       });
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/template-manager.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/template-manager.js
index 71771b401bf..4523207b821 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/template-manager.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/template-manager.js
@@ -2,8 +2,8 @@
 /* jscs:disable */
 define(["html2canvas", "jquery", "mage/translate", "Magento_PageBuilder/js/modal/confirm-alert", "Magento_PageBuilder/js/modal/template-manager-save", "text!Magento_PageBuilder/template/modal/template-manager/save-content-modal.html", "uiRegistry", "underscore", "Magento_PageBuilder/js/acl", "Magento_PageBuilder/js/config"], function (_html2canvas, _jquery, _translate, _confirmAlert, _templateManagerSave, _saveContentModal, _uiRegistry, _underscore, _acl, _config) {
   /**
-   * Copyright © Magento, Inc. All rights reserved.
-   * See COPYING.txt for license details.
+   * Copyright 2019 Adobe
+   * All Rights Reserved.
    */
 
   /**
@@ -128,6 +128,7 @@ define(["html2canvas", "jquery", "mage/translate", "Magento_PageBuilder/js/modal
     renderingLock.then(function () {
       // Resolve issues with Parallax
       var parallaxRestore = disableParallax(stageElement);
+      var canvasElement = document.querySelector("#" + stage.id + " .pagebuilder-canvas");
       stageElement.style.height = (0, _jquery)(stageElement).outerHeight(false) + "px";
       stageElement.classList.add("capture");
       stageElement.classList.add("interacting");
@@ -139,10 +140,11 @@ define(["html2canvas", "jquery", "mage/translate", "Magento_PageBuilder/js/modal
       }
 
       _underscore.defer(function () {
-        (0, _html2canvas)(document.querySelector("#" + stage.id + " .pagebuilder-canvas"), {
+        (0, _html2canvas)(canvasElement, {
           scale: 1,
           useCORS: true,
-          scrollY: window.pageYOffset * -1
+          scrollY: window.pageYOffset * -1,
+          height: correctCanvasHeight(canvasElement)
         }).then(function (canvas) {
           var imageSrc = canvas.toDataURL("image/jpeg", 0.85);
           deferred.resolve(imageSrc);
@@ -204,9 +206,20 @@ define(["html2canvas", "jquery", "mage/translate", "Magento_PageBuilder/js/modal
       container.style.display = "";
     });
   }
+  /**
+   * Adjust canvas element size to prevent area overflow.
+   *
+   * @param canvasElement
+   */
+
+
+  function correctCanvasHeight(canvasElement) {
+    // @ts-ignore
+    return canvasElement.getHeight() < 4096 ? canvasElement.getHeight() : 4096;
+  }
 
   return {
     saveAsTemplate: saveAsTemplate
   };
 });
-//# sourceMappingURL=template-manager.js.map
\ No newline at end of file
+//# sourceMappingURL=template-manager.js.map
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.js
index 98c88104402..20dab6f47a6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.js
@@ -253,7 +253,8 @@ define(["jquery", "mage/adminhtml/tools", "mage/translate", "mageUtils", "Magent
 
 
   function moveToBookmark(bookmark) {
-    window.tinymce.activeEditor.selection.moveToBookmark(bookmark);
+    getActiveEditor().selection.moveToBookmark(bookmark);
+    getActiveEditor().nodeChanged();
   }
   /**
    * Retrieve active editor from TinyMCE
@@ -432,6 +433,44 @@ define(["jquery", "mage/adminhtml/tools", "mage/translate", "mageUtils", "Magent
       return "<" + tag + sanitizedAttributes + ">";
     });
   }
+  /**
+   * Remove Page Builder reserved html tag attributes from the content
+   *
+   * @param {string} content
+   * @returns {string}
+   */
+
+
+  function removeReservedHtmlAttributes(content) {
+    var attributes = _config.getConfig("stage_config").reserved_html_attributes || {};
+
+    for (var _i = 0, _Object$keys = Object.keys(attributes); _i < _Object$keys.length; _i++) {
+      var attribute = _Object$keys[_i];
+      content = removeHtmlTagAttribute(content, attribute);
+    }
+
+    return content;
+  }
+  /**
+   * Remove attribute from html tags
+   *
+   * @param {string} content
+   * @param {string} name
+   * @returns {string}
+   */
+
+
+  function removeHtmlTagAttribute(content, name) {
+    if (typeof content === "string" && content.indexOf(name + "=") !== -1) {
+      var html = new DOMParser().parseFromString(content, "text/html");
+      html.querySelectorAll("[" + name + "]").forEach(function (child) {
+        child.removeAttribute(name);
+      });
+      content = html.body.innerHTML;
+    }
+
+    return content;
+  }
 
   return {
     isWysiwygSupported: isWysiwygSupported,
@@ -448,7 +487,8 @@ define(["jquery", "mage/adminhtml/tools", "mage/translate", "mageUtils", "Magent
     processInlineStyles: processInlineStyles,
     escapeDoubleQuoteWithinWidgetDirective: escapeDoubleQuoteWithinWidgetDirective,
     unescapeDoubleQuoteWithinWidgetDirective: unescapeDoubleQuoteWithinWidgetDirective,
-    replaceDoubleQuoteWithSingleQuoteWithinVariableDirective: replaceDoubleQuoteWithSingleQuoteWithinVariableDirective
+    replaceDoubleQuoteWithSingleQuoteWithinVariableDirective: replaceDoubleQuoteWithSingleQuoteWithinVariableDirective,
+    removeReservedHtmlAttributes: removeReservedHtmlAttributes
   };
 });
 //# sourceMappingURL=editor.js.map
\ No newline at end of file
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/image.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/image.js
index e3260756463..691717e18ae 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/image.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/image.js
@@ -16,13 +16,11 @@ define(["Magento_PageBuilder/js/config", "Magento_PageBuilder/js/utils/directive
   function decodeUrl(value) {
     var result = "";
     value = decodeURIComponent(value.replace(window.location.href, ""));
-    var regexp = /{{.*\s*url="?(.*\.([a-z|A-Z]*))"?\s*}}/;
-
+    var regexp = /{{.*\s*url="?(.*\.([a-z|A-Z|0-9?=]*))\"?\s*}}/;
     if (regexp.test(value)) {
       var _regexp$exec = regexp.exec(value),
-          url = _regexp$exec[1],
-          type = _regexp$exec[2];
-
+        url = _regexp$exec[1],
+        type = _regexp$exec[2];
       var image = {
         name: url.split("/").pop(),
         size: 0,
@@ -31,38 +29,34 @@ define(["Magento_PageBuilder/js/config", "Magento_PageBuilder/js/utils/directive
       };
       result = [image];
     }
-
     return result;
   }
+
   /**
    * Convert a URL to an image directive
    *
    * @param {string} imageUrl
    * @returns {string}
    */
-
-
   function urlToDirective(imageUrl) {
     var mediaUrl = (0, _url.convertUrlToPathIfOtherUrlIsOnlyAPath)(_config.getConfig("media_url"), imageUrl);
     var mediaPath = imageUrl.split(mediaUrl);
     return "{{media url=" + mediaPath[1] + "}}";
   }
+
   /**
    * Convert an image URL to a background image data uri
    *
    * @param {string} imageUrl
    * @returns {string}
    */
-
-
   function imageToBackgroundImageDataUrl(imageUrl) {
     return "url(\'" + (0, _directives.toDataUrl)(urlToDirective(imageUrl)) + "\')";
   }
-
   return {
     decodeUrl: decodeUrl,
-    urlToDirective: urlToDirective,
-    imageToBackgroundImageDataUrl: imageToBackgroundImageDataUrl
+    imageToBackgroundImageDataUrl: imageToBackgroundImageDataUrl,
+    urlToDirective: urlToDirective
   };
 });
-//# sourceMappingURL=image.js.map
\ No newline at end of file
+//# sourceMappingURL=image.js.map
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce.js
index f090c94bcfa..813eff5a5f2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce.js
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/wysiwyg/tinymce.js
@@ -145,7 +145,7 @@ define(["jquery", "mage/adminhtml/wysiwyg/events", "mage/adminhtml/wysiwyg/tiny_
 
       _underscore.defer(function () {
         return (0, _delayUntil)(function () {
-          var $inlineToolbar = _this2.getFixedToolbarContainer().find(".tox-tinymce-inline");
+          var $inlineToolbar = _this2.getFixedToolbarContainer().find(".tox-hugerte-inline");
 
           var self = _this2;
           $inlineToolbar.css("min-width", _this2.config.adapter_config.minToolbarWidth + "px");
@@ -170,7 +170,7 @@ define(["jquery", "mage/adminhtml/wysiwyg/events", "mage/adminhtml/wysiwyg/tiny_
             _this2.resizeObserver.observe($inlineToolbar.get(0));
           }
 
-          var dialogContainer = document.querySelector("#" + _this2.elementId + " ~ .tox-tinymce-aux");
+          var dialogContainer = document.querySelector("#" + _this2.elementId + " ~ .tox-hugerte-aux");
 
           if (!!dialogContainer) {
             dialogContainer.setAttribute("data-editor-aux", _this2.elementId);
@@ -196,10 +196,10 @@ define(["jquery", "mage/adminhtml/wysiwyg/events", "mage/adminhtml/wysiwyg/tiny_
     ;
 
     _proto.onBlur = function onBlur() {
-      this.getFixedToolbarContainer().removeClass("pagebuilder-toolbar-active").find(".tox-tinymce-inline").css("top", "");
+      this.getFixedToolbarContainer().removeClass("pagebuilder-toolbar-active").find(".tox-hugerte-inline").css("top", "");
 
       if (this.resizeObserver) {
-        this.resizeObserver.unobserve(this.getFixedToolbarContainer().find(".tox-tinymce-inline").get(0));
+        this.resizeObserver.unobserve(this.getFixedToolbarContainer().find(".tox-hugerte-inline").get(0));
       }
 
       this.toolbarHeight = 0;
@@ -238,7 +238,7 @@ define(["jquery", "mage/adminhtml/wysiwyg/events", "mage/adminhtml/wysiwyg/tiny_
         return;
       }
 
-      var $inlineToolbar = this.getFixedToolbarContainer().find(".tox-tinymce-inline");
+      var $inlineToolbar = this.getFixedToolbarContainer().find(".tox-hugerte-inline");
 
       if (!$inlineToolbar.length) {
         return;
@@ -275,4 +275,4 @@ define(["jquery", "mage/adminhtml/wysiwyg/events", "mage/adminhtml/wysiwyg/tiny_
 
   return Wysiwyg;
 });
-//# sourceMappingURL=tinymce.js.map
\ No newline at end of file
+//# sourceMappingURL=tinymce.js.map
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type-toolbar.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type-toolbar.html
index b6f3b97775a..ccfc2df5099 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type-toolbar.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type-toolbar.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/master.html
index e1f7feb4076..1eb0f8ad2d7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/preview.html
index 4ef252eab60..685015dd8c2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-centered/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/master.html
index 34d79931efc..15775f55f57 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html
index ae282b64c41..36413bcf711 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-left/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/master.html
index 34d79931efc..15775f55f57 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html
index 361772bff60..5d9e1e994f4 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/collage-right/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/master.html
index a7d8321ef33..bd0c349bc8c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html
index 1a79404976f..9af78d60b70 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/banner/poster/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/master.html
index d02723f2e23..380cfa502b7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/preview.html
index 84b4fc586f1..777f8fed1b1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/block/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/master.html
index 47a05650753..99f9cb38dfc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/preview.html
index 472b366297c..50ae4587f8e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/button-item/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/master.html
index 70fe8bce7dc..d161e88d63a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/preview.html
index 56039be9dfe..2c7c09a5b5a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/inline/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/master.html
index 70fe8bce7dc..d161e88d63a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/preview.html
index fac1c477eab..345ed038dd3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/buttons/stacked/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/master.html
index 2fe2ed74cc5..11118cc5a87 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/preview.html
index f0dd3f5b5ce..80058528218 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-group/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
@@ -16,7 +16,6 @@
         <div class="grid-line"></div>
     </div>
     <div class="resize-ghost" afterRender="function (element) { bindGhost.call($data, element); }"></div>
-    <div class="drop-placeholder" afterRender="function (element) { bindDropPlaceholder.call($data, element); }"></div>
     <div class="move-placeholder" afterRender="function (element) { bindMovePlaceholder.call($data, element); }"></div>
     <div class="pagebuilder-display-label label-column-group"
          text="displayLabel().toUpperCase()">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-line/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-line/default/master.html
new file mode 100644
index 00000000000..a4184d240c0
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-line/default/master.html
@@ -0,0 +1,13 @@
+<!--
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<div class="pagebuilder-column-line"
+     attr="data.main.attributes"
+     ko-style="data.main.style"
+     css="data.main.css">
+    <render args="masterTemplate"></render>
+</div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-line/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-line/default/preview.html
new file mode 100644
index 00000000000..50ec422b33b
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column-line/default/preview.html
@@ -0,0 +1,28 @@
+<!--
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<div class="pagebuilder-column-line pagebuilder-content-type"
+     css="{'resizing': resizing}"
+     attr="data.main.attributes">
+    <div class="column-drop-placeholder"
+         afterRender="function (element) { bindColumnLineDropPlaceholder.call($data, element); }">
+    </div>
+    <div class="resize-grid" each="gridSizeArray">
+        <div class="grid-line"></div>
+    </div>
+    <div class="resize-ghost" afterRender="function (element) { bindGhost.call($data, element); }"></div>
+    <div class="drop-placeholder" afterRender="function (element) { bindDropPlaceholder.call($data, element); }"></div>
+    <div class="move-placeholder" afterRender="function (element) { bindMovePlaceholder.call($data, element); }"></div>
+    <div class="element-children"
+         each="$parent.getChildren()"
+         afterRender="function (element) { bindInteractions.call($data, element); }">
+        <render args="{name: preview.template, data: preview}"></render>
+    </div>
+    <div class="bottom-drop-placeholder"
+         afterRender="function (element) { bindColumnLineBottomDropPlaceholder.call($data, element); }" >
+    </div>
+</div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/master.html
index ade330c3fce..b84cc9116d6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/preview.html
index 59cdf5c3551..725f43d0d8f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/column/full-height/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/master.html
index b1c0969e07a..68abac17a10 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/master.html
@@ -1,10 +1,10 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
 <div attr="data.main.attributes" css="data.main.css" ko-style="data.main.style">
-    <hr attr="data.line.attributes" css="data.line.css" ko-style="data.line.style" />
+    <hr attr="data.line.attributes" css="data.line.css" ko-style="data.line.style">
 </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/preview.html
index 10a7d1d4903..48ba9407fc0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/divider/default/preview.html
@@ -1,13 +1,13 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
 <div class="pagebuilder-content-type pagebuilder-divider" event="{ mouseover: onMouseOver, mouseout: onMouseOut }, mouseoverBubble: false">
     <div attr="data.main.attributes" css="data.main.css" ko-style="data.main.style">
-        <hr attr="data.line.attributes" css="data.line.css" ko-style="data.line.style" />
+        <hr attr="data.line.attributes" css="data.line.css" ko-style="data.line.style">
     </div>
     <render args="getOptions().template" ></render>
 </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/master.html
index b696a4f1761..4b2902dfeb6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/preview.html
index b31ce0258b9..e1f14479154 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/heading/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/master.html
index 7202e47e3c3..59031a9a3a1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/preview.html
index e82ed93516f..9e98f13402a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/html/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/master.html
index 3c49c8e6546..85f067765d1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/preview.html
index f2597aadc61..a29a0ae277d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/image/full-width/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/master.html
index 98d419d92f3..56c98c2d593 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/preview.html
index a8e82c77048..7624b94d365 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/map/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/master-collection.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/master-collection.html
index 5c1c100569d..e1199b3cc39 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/master-collection.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/master-collection.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/menu.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/menu.html
index c16a0cdd964..73758aacb0e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/menu.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/menu.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview-collection.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview-collection.html
index 8269bba881d..7e0558d569d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview-collection.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview-collection.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview.html
index 1974416470b..a7bbd85e63f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="pagebuilder-stage"
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/master.html
index 0adc25e66d1..cb78c85de34 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/preview.html
index 4cbc4abc371..7b6b6c188b5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/products/grid/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/root-container/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/root-container/preview.html
index c7f08027ab7..bb99c1c50a8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/root-container/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/root-container/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/master.html
index f6a97711796..07ed0fca844 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/preview.html
index 1f9a37df1cd..135a9e79e4d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/contained/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/master.html
index f30dd866338..7c2c33ed77c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/preview.html
index 9edf8eb810d..9c0cb58a761 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-bleed/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/master.html
index 6dcd3b995de..24c4e994748 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html
index e621d9009d9..a61a421c203 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/row/full-width/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/master.html
index b7a607f6b99..51ed3bcc7c1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/preview.html
index 8c8819f1d85..4b987490f6b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-centered/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/master.html
index b7a607f6b99..51ed3bcc7c1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html
index a4ae6ee0320..dd08b20eaf2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-left/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/master.html
index d7d527e4d08..9f9b206ef87 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html
index ee5d3abec86..b696f620ed1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/collage-right/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/master.html
index e385ba030c4..6ed46deb6b5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html
index 15d6fcf04a9..85505a902f5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slide/poster/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/master.html
index 8923c2b5797..7af55ccefb6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/preview.html
index f519b4b606b..3ff768239fd 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/slider/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/master.html
index e9023ecc427..288695c6b1b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/preview.html
index f0a59e36c16..ce1b1053f6e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tab-item/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/master.html
index e0aebe3d743..8d4efad4ce0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/preview.html
index e595449c8a3..d68d0f244e7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/tabs/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/master.html
index e99719fefd2..7115a4d1a11 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/preview.html
index d6b1004e053..36c9bddcdf3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/text/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
@@ -12,7 +12,7 @@
          css="data.main.css"
          afterRender="afterRenderWysiwyg"
          contenteditable="true"
-         event="mousedown: stopEvent, click: activateEditor, dblclick: handleDoubleClick">
+         event="mousedown: handleMouseDown, click: activateEditor, dblclick: handleDoubleClick">
     </div>
     <div if="isWysiwygSupported()" class="placeholder-text" ifnot="data.main.html" ko-style="getPlaceholderStyle()" translate="'Edit Text'"></div>
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/title.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/title.html
index 01ebbfb39c8..c263fe8796d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/title.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/title.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/master.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/master.html
index 66859cdd0bb..da183bda0f5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/master.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/master.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/preview.html
index a6cde82a394..7ad83175587 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/content-type/video/default/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/dynamic-rows/element/text.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/dynamic-rows/element/text.html
index 5faae07688e..e679da741bc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/dynamic-rows/element/text.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/dynamic-rows/element/text.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="admin__field"
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/actions.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/actions.html
index 6f91ae45e7e..b953be45007 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/actions.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/actions.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/edit-form-on-click-grid.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/edit-form-on-click-grid.html
index b010ec70765..7180ffaae16 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/edit-form-on-click-grid.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/edit-form-on-click-grid.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/grid.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/grid.html
index cd358ad662c..5ab69b0af79 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/grid.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/dynamic-rows/grid.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/group/group.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/group/group.html
index 9b0194e8c90..3a0dcc5aa72 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/group/group.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/components/group/group.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <fieldset class="admin__field"
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/block-chooser.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/block-chooser.html
index 07351113088..3a22d9fe02f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/block-chooser.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/block-chooser.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/html-code.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/html-code.html
index 2fcbb6afd2a..895a8c2a6c5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/html-code.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/html-code.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/input-no-maxlength.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/input-no-maxlength.html
index 9e4b37b6629..b18a1ca6e01 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/input-no-maxlength.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/input-no-maxlength.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <input class="admin__control-text" type="text"
@@ -16,4 +16,4 @@
             'aria-describedby': noticeId,
             id: uid,
             disabled: disabled
-    }"/>
+    }">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/map.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/map.html
index abe71e3ace7..3e635e19d22 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/map.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/map.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
@@ -9,7 +9,7 @@
     <div visible="!apiKeyValid()" class="google-map-auth-failure-placeholder"><p html="apiKeyErrorMessage"></p></div>
     <div visible="apiKeyValid" class="map-field" afterRender="renderMap"></div>
     <div attr="id: uid, name: inputName">
-        <input type="text" ko-value="value().longitude" attr="name: inputName + '.longitude'"/>
-        <input type="text" ko-value="value().latitude" attr="name: inputName + '.latitude'"/>
+        <input type="text" ko-value="value().longitude" attr="name: inputName + '.longitude'">
+        <input type="text" ko-value="value().latitude" attr="name: inputName + '.latitude'">
     </div>
 </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/margins-and-padding.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/margins-and-padding.html
index a5a2a65369d..372e0c26f54 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/margins-and-padding.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/margins-and-padding.html
@@ -1,26 +1,26 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
 <div class="admin__field-design-options">
-    <input type="text" ko-value="value" attr="id: uid, name: inputName"/>
+    <input type="text" ko-value="value" attr="id: uid, name: inputName">
 
     <div class="layout-onion">
         <div class="layout-onion-layer layout-margin">
             <span class="label" data-bind="i18n: 'Margin'"></span>
-            <input type="text" class="admin__control-text layout-onion-top" name="marginTop" data-bind="textInput: marginTop, attr: { placeholder: placeholder }" />
-            <input type="text" class="admin__control-text layout-onion-right" name="marginRight" data-bind="textInput: marginRight, attr: { placeholder: placeholder }" />
-            <input type="text" class="admin__control-text layout-onion-bottom" name="marginBottom" data-bind="textInput: marginBottom, attr: { placeholder: placeholder }" />
-            <input type="text" class="admin__control-text layout-onion-left" name="marginLeft" data-bind="textInput: marginLeft, attr: { placeholder: placeholder }" />
+            <input type="text" class="admin__control-text layout-onion-top" name="marginTop" data-bind="textInput: marginTop, attr: { placeholder: placeholder }">
+            <input type="text" class="admin__control-text layout-onion-right" name="marginRight" data-bind="textInput: marginRight, attr: { placeholder: placeholder }">
+            <input type="text" class="admin__control-text layout-onion-bottom" name="marginBottom" data-bind="textInput: marginBottom, attr: { placeholder: placeholder }">
+            <input type="text" class="admin__control-text layout-onion-left" name="marginLeft" data-bind="textInput: marginLeft, attr: { placeholder: placeholder }">
             <div class="layout-onion-layer layout-border">
                 <span class="label" data-bind="i18n: 'Padding'"></span>
-                <input type="text" class="admin__control-text layout-onion-top" name="paddingTop" data-bind="textInput: paddingTop, attr: { placeholder: placeholder }" />
-                <input type="text" class="admin__control-text layout-onion-right" name="paddingRight" data-bind="textInput: paddingRight, attr: { placeholder: placeholder }" />
-                <input type="text" class="admin__control-text layout-onion-bottom" name="paddingBottom" data-bind="textInput: paddingBottom, attr: { placeholder: placeholder }" />
-                <input type="text" class="admin__control-text layout-onion-left" name="paddingLeft" data-bind="textInput: paddingLeft, attr: { placeholder: placeholder }" />
+                <input type="text" class="admin__control-text layout-onion-top" name="paddingTop" data-bind="textInput: paddingTop, attr: { placeholder: placeholder }">
+                <input type="text" class="admin__control-text layout-onion-right" name="paddingRight" data-bind="textInput: paddingRight, attr: { placeholder: placeholder }">
+                <input type="text" class="admin__control-text layout-onion-bottom" name="paddingBottom" data-bind="textInput: paddingBottom, attr: { placeholder: placeholder }">
+                <input type="text" class="admin__control-text layout-onion-left" name="paddingLeft" data-bind="textInput: paddingLeft, attr: { placeholder: placeholder }">
             </div>
         </div>
     </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/product-totals.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/product-totals.html
index 712418c9733..0322385fe85 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/product-totals.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/product-totals.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <div data-role="spinner"
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/image.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/image.html
index 2ae8128963b..80ded44cb4f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/image.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/image.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="admin__field" visible="visible" css="$data.additionalClasses">
@@ -12,7 +12,7 @@
     <div class="admin__field-control" css="'_with-tooltip': $data.tooltip">
         <div class="file-uploader image-uploader" data-role="drop-zone" css="_loading: isLoading">
             <div class="file-uploader-area">
-                <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled" />
+                <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled">
                 <label class="file-uploader-button action-default" attr="for: uid, disabled: disabled" disable="disabled" translate="'Upload'"></label>
                 <label
                     data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview.html
index edff66a6ce2..28e56368bb9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="file-uploader-summary">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html
index 8a57ee6022d..a00b45601ec 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/uploader/preview/image.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="pagebuilder-image-uploader-container" data-role="drop-zone" css="_loading: isLoading, 'has-data': hasData()">
@@ -9,12 +9,20 @@
         <div class="pagebuilder-options-wrapper">
             <ul class="pagebuilder-options-links">
                 <li class="pagebuilder-options-link">
-                    <label
-                        data-bind="event: {mousedown: stopEvent}"
-                        class="file-uploader-button action-default"
-                        attr="for: uid"
-                        disable="disabled"
-                        translate="translations.uploadNewImage"></label>
+                    <span class="file-uploader-area" if="visibleControls">
+                        <input
+                            type="file"
+                            afterRender="onElementRender"
+                            attr="id: uid, name: inputName, multiple: isMultipleFiles"
+                            class="file-upload-options-link"
+                            disable="disabled"></input>
+                        <label
+                            data-bind="event: {mousedown: stopEvent}"
+                            class="file-uploader-button action-default action-upload-image"
+                            attr="for: uid"
+                            disable="disabled"
+                            translate="translations.uploadNewImage"></label>
+                    </span>
                 </li>
                 <li class="pagebuilder-options-link">
                     <label
@@ -38,8 +46,17 @@
             <div class="file-uploader image-uploader">
                 <div class="file-uploader-area" if="visibleControls">
                     <p class="image-upload-instructions" translate="translations.dragImageHere"></p>
-                    <input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled"/>
-                    <label class="file-uploader-button action-default" attr="for: uid" disable="disabled" translate="translations.uploadImage"></label>
+                    <input
+                        type="file"
+                        class="file-upload-empty-preview"
+                        afterRender="onElementRender"
+                        attr="id: uid, name: inputName, multiple: isMultipleFiles"
+                        disable="disabled"></input>
+                    <label
+                        class="file-uploader-button action-default action-upload-image"
+                        attr="for: uid"
+                        disable="disabled"
+                        translate="translations.uploadImage"></label>
                     <span translate="translations.or"></span>
                     <label
                         data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/url-input.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/url-input.html
index f8c154b8ff0..05abdd17511 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/url-input.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/url-input.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <!--render select with link types-->
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/visual-select.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/visual-select.html
index f1306d8107e..c2684ed779f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/visual-select.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/visual-select.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
@@ -9,7 +9,7 @@
     <input type="text"
            ko-value="value"
            ko-disabled="disabled"
-           attr="id: uid, name: inputName"/>
+           attr="id: uid, name: inputName">
 
     <ol data-bind="foreach: options, css: {'_disabled': disabled}">
         <li data-bind="click: function() { if(!$parent.disabled()) {$parent.value(value);} }, css: {active: $parent.value() == value, 'admin__field-visual-select-small': $data.size == 'small', 'admin__field-visual-select-large': $data.size == 'large', 'no-pointer-events': $parent.disabled()}, event: {keyup: function() { if(!$parent.disabled() && (event.keyCode==32||event.keyCode==13)) { $parent.value(value);} }}, attr: { tabindex: !$parent.disabled() ? 0 : 'false', name: value }">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/widget-conditions.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/widget-conditions.html
index 450316dfaaa..d24aa60152b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/widget-conditions.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/widget-conditions.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/wysiwyg.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/wysiwyg.html
index 62bfd1d6345..a268eacc4d9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/wysiwyg.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/form/element/wysiwyg.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/preview-image/preview.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/preview-image/preview.html
index 835724d80b9..62d501b2c97 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/preview-image/preview.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/preview-image/preview.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/single-select.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/single-select.html
index 8be00185dff..0b539bd936d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/single-select.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/single-select.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <label class="data-grid-state-cell-inner single-select-cell">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/template-apply.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/template-apply.html
index 69def0afe02..390fbe2a1b7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/template-apply.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/grid/cells/template-apply.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <label class="data-grid-state-cell-inner single-select-cell">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/dismissible-modal-content.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/dismissible-modal-content.html
index 6a77ab35071..7b33d5180cd 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/dismissible-modal-content.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/dismissible-modal-content.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/template-manager/save-content-modal.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/template-manager/save-content-modal.html
index 41cc2356a80..0be2c5db6a1 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/template-manager/save-content-modal.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/modal/template-manager/save-content-modal.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 -->
 <form <%= formAttr %>>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html
index 1fdce9f64a9..6b0760dc89c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/page-builder.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <div class="pagebuilder-stage-wrapper"
@@ -31,6 +31,7 @@
         <with args="stage">
             <render></render>
         </with>
-        <iframe width="1" height="1" attr="id: 'render_frame_' + id" sandbox="allow-scripts" style="display: none;"></iframe>
+        <!-- Do not modify the "sandbox" attribute without approval from a security engineer -->
+        <iframe attr="id: 'render_frame_' + id" sandbox="allow-scripts" style="position: absolute; width:0; height:0; border: none;"></iframe>
     </if>
 </div>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html
index 745e5f876bb..315c6784bd0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/panel.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 
@@ -12,7 +12,7 @@
         <div class="search-content-types">
             <label for="search-content-types-input"></label>
             <a href="" class="close" click="clearSearch" attr="title: searchTitle" visible="searching"></a>
-            <input type="text" id="search-content-types-input" name="search" ko-value="searchValue" event="keyup: search" attr="placeholder: searchPlaceholder" autocomplete="off"/>
+            <input type="text" id="search-content-types-input" name="search" ko-value="searchValue" event="keyup: search" attr="placeholder: searchPlaceholder" autocomplete="off">
         </div>
         <ul id="search-results" visible="searching() && searchResults().length" each="searchResults">
             <li class="pagebuilder-draggable-content-type" attr="id: 'content-type-' + identifier()" data-bind="draggable: Object.assign($parent.getDraggableOptions(), getDraggableOptions())">
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/template/viewport/switcher.html b/app/code/Magento/PageBuilder/view/adminhtml/web/template/viewport/switcher.html
index e8c471afba2..82be25d47db 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/template/viewport/switcher.html
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/template/viewport/switcher.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <each args="data: Object.keys(viewports), as: 'name'">
@@ -14,8 +14,8 @@
             <img data-bind="attr:{src: $parent.viewports[name].icon}" draggable="false" aria-hidden="true"/>
         </button>
         <span class="tooltip-content">
-            <span class="tooltip-label" translate="$parent.viewports[name].label"></span><br/>
-            <span translate="'View your content for '"></span><text args="name"></text><br/>
+            <span class="tooltip-label" translate="$parent.viewports[name].label"></span><br>
+            <span translate="'View your content for '"></span><text args="name"></text><br>
             <span translate="'Width'"></span>: <text args="Object.values($parent.viewports[name].conditions)[0]"></text>
         </span>
     </span>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/acl.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/acl.ts
index 010fa64dfb4..5b5ecdfeb38 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/acl.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/acl.ts
@@ -11,11 +11,8 @@ export const resources: AclResources = {
 };
 
 /**
- * Determine if the current user is allowed to access this resource
- *
- * Usage: isAllowed(resources.TEMPLATE_SAVE)
- *
- * @param resource
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 export function isAllowed(resource: string) {
     return Config.getConfig("acl")[resource] === true;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/active-options.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/active-options.types.ts
index 6df1f78f50a..3af29dc3ae4 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/active-options.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/active-options.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/draggable.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/draggable.ts
index f74fa8ecb25..b6f5e1e454e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/draggable.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/draggable.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/focus.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/focus.ts
index 0050f5b7687..b300ba67fcb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/focus.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/focus.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/live-edit.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/live-edit.ts
index 2d6a5d63485..3ca0cf00922 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/live-edit.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/live-edit.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 /**
  * @api
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/master-style.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/master-style.ts
index efff293a955..9ff12d172bf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/master-style.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/master-style.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.ts
index 5f21ab07a36..15bf1111082 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 /**
  * @api
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.types.ts
index d1983b3cf62..dfe70de889a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable-children.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 /// <reference types="jqueryui" />
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable.ts
index da946194d81..928c8dd5771 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/sortable.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/style.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/style.ts
index 04ca091fdcc..fafc8acc830 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/style.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/binding/style.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/collection.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/collection.ts
index 8fc0e61134d..0e03f16275b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/collection.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/collection.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.ts
index 08abb1e2c6b..6d69faea6e7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.types.ts
index aed1de687f2..6ced4e64fe3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/config.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeConfigInterface from "./content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.ts
index 6891b653584..75cf3693b73 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import events from "Magento_PageBuilder/js/events";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.types.ts
index b09566f1ca6..b28eed424df 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-collection.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeInterface from "./content-type.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-config.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-config.types.ts
index 13eb37cd2bb..b0c7dd76055 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-config.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-config.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-factory.ts
index d1ff815ec56..bd67e92a923 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import events from "Magento_PageBuilder/js/events";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu.ts
index 64ac24fee54..f0ad9056f1c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/conditional-remove-option.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/conditional-remove-option.ts
index 190523f1fe6..ef1bcdd2770 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/conditional-remove-option.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/conditional-remove-option.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Option from "./option";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/edit.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/edit.ts
index 70817085c49..74ec0f0b10f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/edit.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/edit.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import events from "Magento_PageBuilder/js/events";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/hide-show-option.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/hide-show-option.ts
index 5cff0cc54e8..84ab8adb708 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/hide-show-option.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/hide-show-option.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 import $t from "mage/translate";
 import {DataObject} from "../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.ts
index 3cae29182a9..e6ff39017fb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.types.ts
index 5b7f10459b0..fcf2a568dc4 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/option.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import Preview from "../content-type/preview";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/title-option.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/title-option.ts
index 6e62040a391..d3f8ef2d7d2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/title-option.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-menu/title-option.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Option from "./option";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.ts
index f4e06a5816b..fda7e11de71 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.types.ts
index 3d317f36140..a1e47fdaa66 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type-toolbar.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.ts
index a18532a5175..33271b9fe3c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import events from "Magento_PageBuilder/js/events";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.types.ts
index fb80603ef2e..f0c111c5537 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "./content-type-collection.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/appearance-config.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/appearance-config.ts
index 39d486c713f..07b7dc87524 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/appearance-config.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/appearance-config.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/attribute/overlay-color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/attribute/overlay-color.ts
index 44e2cbae1d0..a2d5dbb0210 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/attribute/overlay-color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/attribute/overlay-color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-opacity.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-opacity.ts
index e1cd49e8a84..03c59da2b94 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-opacity.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-opacity.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-visibility.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-visibility.ts
index fcedbb1ce69..6fff9572096 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-visibility.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/button-visibility.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/overlay-background-color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/overlay-background-color.ts
index 50ddb1f6b92..8c0e563cbc3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/overlay-background-color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/converter/style/overlay-background-color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/preview.ts
index 2e88154da24..a5a88b2f66a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import "jarallax";
@@ -24,6 +24,7 @@ import {
     isWysiwygSupported,
     lockImageSize,
     moveToBookmark,
+    removeReservedHtmlAttributes,
     unlockImageSize,
 } from "../../utils/editor";
 import nestingLinkDialog from "../../utils/nesting-link-dialog";
@@ -493,6 +494,14 @@ export default class Preview extends BasePreview {
      * @inheritDoc
      */
     protected bindEvents() {
+        this.contentType.dataStore.subscribe((state: DataObject) => {
+            const sanitizedContent = removeReservedHtmlAttributes(state.message);
+
+            if (sanitizedContent !== state.message) {
+                state.message = sanitizedContent;
+            }
+        }, "message");
+
         super.bindEvents();
         events.on("banner:mountAfter", (args: ContentTypeReadyEventParamsInterface) => {
             if (args.id === this.contentType.id) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/wysiwyg/tinymce/component-initializer.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/wysiwyg/tinymce/component-initializer.ts
index 55dd6fcd721..16855cef925 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/wysiwyg/tinymce/component-initializer.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/banner/wysiwyg/tinymce/component-initializer.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/mass-converter/widget-directive.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/mass-converter/widget-directive.ts
index 2d742da1de0..ada6fb28ab7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/mass-converter/widget-directive.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/mass-converter/widget-directive.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {ConverterConfigInterface, ConverterDataInterface} from "../../../mass-converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/preview.ts
index 205ac3ed319..1c8c9b600c3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/block/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/converter/style/display.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/converter/style/display.ts
index 9c4701cf905..9120640fbb2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/converter/style/display.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/converter/style/display.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/preview.ts
index ab8c568072e..68e659429ed 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/button-item/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/boolean.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/boolean.ts
index 522aa6ca471..4c018efebb8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/boolean.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/boolean.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/flex.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/flex.ts
index 5759b5d8dfb..50aafc2ab1b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/flex.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/display/flex.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/preview/display/flex.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/preview/display/flex.ts
index 08d551f4746..399509f944e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/preview/display/flex.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/converter/style/preview/display/flex.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts
index c748b550893..a167d72b01f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/buttons/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/drag-and-drop.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/drag-and-drop.ts
index 9c4a8e9f39c..508369d6ff7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/drag-and-drop.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/drag-and-drop.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/factory.ts
index 8e899bfe21d..90cf14928ee 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/factory.ts
@@ -1,8 +1,9 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
+import ColumnLinePreview from "Magento_PageBuilder/js/content-type/column-line/preview";
 import Config from "../../config";
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
 import createContentType from "../../content-type-factory";
@@ -34,3 +35,30 @@ export function createColumn(
         return null;
     });
 }
+
+/**
+ * Create a column and add it to it's column group
+ *
+ * @param {ContentTypeCollectionInterface} columnGroup
+ * @param {number} width
+ * @param {number} index
+ * @returns {Promise<ContentTypeCollectionInterface>}
+ */
+export function createColumnLine(
+    columnGroup: ContentTypeCollectionInterface,
+    width: number,
+    index?: number,
+): Promise<ContentTypeCollectionInterface<ColumnLinePreview>> {
+    return createContentType(
+        Config.getContentTypeConfig("column-line"),
+        columnGroup,
+        columnGroup.stageId,
+        {width: parseFloat(width.toString()) + "%"},
+    ).then((columnLine: ContentTypeCollectionInterface<ColumnLinePreview>) => {
+        columnGroup.addChild(columnLine, index);
+        return columnLine;
+    }).catch((error) => {
+        console.error(error);
+        return null;
+    });
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/grid-size.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/grid-size.ts
index d36396c59dc..42a8a266d68 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/grid-size.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/grid-size.ts
@@ -1,11 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $t from "mage/translate";
 import Config from "../../config";
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
+import ColumnLinePreview from "../column-line/preview";
 import ColumnPreview from "../column/preview";
 import {updateColumnWidth} from "../column/resize";
 import ColumnGroupPreview from "./preview";
@@ -52,10 +53,14 @@ export function resizeGrid(
 
     validateNewGridSize(columnGroup, newGridSize);
 
-    // if we have more columns than the new grid size allows, remove empty columns until we are at the correct size
-    if (newGridSize < columnGroup.getChildren()().length) {
-        removeEmptyColumnsToFit(columnGroup, newGridSize);
-    }
+    columnGroup.getChildren()().forEach(
+        (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
+            // if we have more columns than the new grid size allows, remove empty columns till the correct size
+            console.log(columnLine.getChildren()().length);
+            if (newGridSize < columnLine.getChildren()().length) {
+                removeEmptyColumnsToFit(columnLine, newGridSize);
+            }
+        });
 
     // update column widths
     redistributeColumnWidths(columnGroup, newGridSize, gridSizeHistory);
@@ -76,21 +81,30 @@ function validateNewGridSize(columnGroup: ContentTypeCollectionInterface<ColumnG
     }
 
     // Validate that the operation will be successful
-    const numCols = columnGroup.getChildren()().length;
-    const currentGridSize = columnGroup.preview.getResizeUtils().getInitialGridSize();
-    if (newGridSize < currentGridSize && numCols > newGridSize) {
-        let numEmptyColumns = 0;
-        columnGroup.getChildren()().forEach(
-            (column: ContentTypeCollectionInterface<ColumnPreview>) => {
-                if (column.getChildren()().length === 0) {
-                    numEmptyColumns++;
+
+    let doThrowException = false;
+    columnGroup.getChildren()().forEach(
+        (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
+            let numEmptyColumns = 0;
+            const numCols = columnLine.getChildren()().length;
+            const currentGridSize = columnLine.preview.getResizeUtils().getInitialGridSize();
+            if (newGridSize < currentGridSize && numCols > newGridSize) {
+                columnLine.getChildren()().forEach(
+                    (column: ContentTypeCollectionInterface<ColumnPreview>) => {
+                    if (column.getChildren()().length === 0) {
+                        numEmptyColumns++;
+                    }
+                });
+                if (newGridSize < numCols - numEmptyColumns) {
+                    doThrowException = true;
                 }
-            });
-        if (newGridSize < numCols - numEmptyColumns) {
-            throw new GridSizeError(
-                $t("Grid size cannot be smaller than the current total amount of columns, minus any empty columns."),
-            );
-        }
+            }
+        });
+
+    if (doThrowException) {
+        throw new Error(
+            $t("Grid size cannot be smaller than the current total amount of columns, minus any empty columns."),
+        );
     }
 }
 
@@ -100,14 +114,14 @@ function validateNewGridSize(columnGroup: ContentTypeCollectionInterface<ColumnG
  * @param {ContentTypeCollectionInterface<Preview>} columnGroup
  * @param {number} newGridSize
  */
-function removeEmptyColumnsToFit(columnGroup: ContentTypeCollectionInterface<ColumnGroupPreview>, newGridSize: number) {
-    const columns = columnGroup.getChildren()() as Array<ContentTypeCollectionInterface<ColumnPreview>>;
+function removeEmptyColumnsToFit(columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, newGridSize: number) {
+    const columns = columnLine.getChildren()() as Array<ContentTypeCollectionInterface<ColumnPreview>>;
     let numColumns = columns.length;
     let i;
     for (i = numColumns - 1; i >= 0; i--) {
         const column: ContentTypeCollectionInterface<ColumnPreview> = columns[i];
         if (newGridSize < numColumns && column.getChildren()().length === 0) {
-            columnGroup.removeChild(column);
+            columnLine.removeChild(column);
             numColumns--;
         }
     }
@@ -139,87 +153,98 @@ function redistributeColumnWidths(
         return;
     }
 
-    const resizeUtils = columnGroup.preview.getResizeUtils();
-    const existingGridSize = resizeUtils.getInitialGridSize();
+    const columnGroupResizeUtil = columnGroup.preview.getResizeUtils();
+    const existingGridSize = columnGroupResizeUtil.getInitialGridSize();
     const minColWidth = parseFloat((100 / newGridSize).toString()).toFixed(
         Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0,
     );
-    let totalNewWidths = 0;
-    const numColumns = columnGroup.getChildren()().length;
-    let remainingWidth: number = 0;
-    columnGroup.getChildren()().forEach(
-        (column: ContentTypeCollectionInterface<ColumnPreview>, index: number) => {
-            const existingWidth = resizeUtils.getColumnWidth(column);
-            const fractionColumnWidth = Math.round(existingWidth / (100 / existingGridSize));
-            /**
-             * Determine if the grid & column are directly compatible with the new defined grid size, this will directly
-             * convert fractions to their equivalent of the new grid size.
-             *
-             * For instance changing a 12 column grid with 2 x 6 / 12 columns to a 6 grid is fully compatible.
-             *
-             * Check the existing grid size and new grid size are divisible, verify the amount of columns will fit
-             * in the new grid size and finally check the calculation to convert the existing column width results in a
-             * positive integer.
-             */
-            if (((existingGridSize > newGridSize && existingGridSize % newGridSize === 0)
-                || (existingGridSize < newGridSize && newGridSize % existingGridSize === 0))
-                && newGridSize % numColumns === 0
-                && ((newGridSize / existingGridSize) * fractionColumnWidth) % 1 === 0
-            ) {
-                // We don't need to modify the columns width as it's directly compatible, we will however increment the
-                // width counter as some other columns may not be compatible.
-                totalNewWidths += existingWidth;
-            } else {
-                let newWidth = (100 * Math.floor((existingWidth / 100) * newGridSize) / newGridSize)
-                    .toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0);
-
-                // make sure the column is at least one grid size wide
-                if (parseFloat(newWidth) < parseFloat(minColWidth)) {
-                    newWidth = minColWidth;
-                }
 
-                // make sure we leave enough space for other columns
-                const maxAvailableWidth = 100 - totalNewWidths - ((numColumns - index - 1) * parseFloat(minColWidth));
-                if (parseFloat(newWidth) > maxAvailableWidth) {
-                    newWidth = maxAvailableWidth.toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0);
-                }
-
-                // Calculate any width lost from the column, if a 5 / 12 is becoming a 2 / 6 then it's lost 1 / 12
-                remainingWidth += (existingWidth - parseFloat(newWidth));
+    columnGroup.getChildren()().forEach(
+        (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, columnLineIndex: number) => {
+            let totalNewWidths = 0;
+            let remainingWidth: number = 0;
+            const numColumns = columnLine.getChildren()().length;
+            const resizeUtils = columnLine.preview.getResizeUtils();
+            columnLine.getChildren()().forEach(
+            (column: ContentTypeCollectionInterface<ColumnPreview>, index: number) => {
 
+                const existingWidth = resizeUtils.getColumnWidth(column);
+                const fractionColumnWidth = Math.round(existingWidth / (100 / existingGridSize));
                 /**
-                 * Determine if we have enough remaining width, and apply it to the current column, this results in a
-                 * subsequent column always receiving any additional width from the previous column
+                 * Determine if the grid & column are directly compatible with the new defined grid size, this will
+                 * directly convert fractions to their equivalent of the new grid size.
+                 *
+                 * For instance changing a 12 column grid with 2 x 6 / 12 columns to a 6 grid is fully compatible.
+                 *
+                 * Check the existing grid size and new grid size are divisible, verify the amount of columns will fit
+                 * in the new grid size and finally check the calculation to convert the existing column width results
+                 * in a positive integer.
                  */
-                if (resizeUtils.getSmallestColumnWidth(newGridSize)
-                    === resizeUtils.getAcceptedColumnWidth(remainingWidth.toString(), newGridSize)
+                if (((existingGridSize > newGridSize && existingGridSize % newGridSize === 0)
+                        || (existingGridSize < newGridSize && newGridSize % existingGridSize === 0))
+                    && newGridSize % numColumns === 0
+                    && ((newGridSize / existingGridSize) * fractionColumnWidth) % 1 === 0
                 ) {
-                    const widthWithRemaining = resizeUtils.getAcceptedColumnWidth(
-                        (parseFloat(newWidth) + remainingWidth).toString(),
-                        newGridSize,
-                    );
-                    if (widthWithRemaining > 0) {
-                        newWidth = widthWithRemaining
-                            .toFixed(Math.round(100 / widthWithRemaining) !== 100 / widthWithRemaining ? 8 : 0);
-                        remainingWidth = 0;
+                    // We don't need to modify the columns width as it's compatible, we will however increment the
+                    // width counter as some other columns may not be compatible.
+                    totalNewWidths += existingWidth;
+                } else {
+                    let newWidth = (100 * Math.floor((existingWidth / 100) * newGridSize) / newGridSize)
+                        .toFixed(Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0);
+
+                    // make sure the column is at least one grid size wide
+                    if (parseFloat(newWidth) < parseFloat(minColWidth)) {
+                        newWidth = minColWidth;
+                    }
+
+                    // make sure we leave enough space for other columns
+                    const widthTaken = totalNewWidths + ((numColumns - index - 1) * parseFloat(minColWidth));
+                    const maxAvailableWidth = 100 - totalNewWidths;
+                    if (parseFloat(newWidth) > maxAvailableWidth) {
+                        const gridWidth = Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0;
+                        newWidth = maxAvailableWidth.toFixed(gridWidth);
                     }
+
+                    // Calculate any width lost from the column, if a 5 / 12 is becoming a 2 / 6 then it's lost 1 / 12
+                    remainingWidth += (existingWidth - parseFloat(newWidth));
+
+                    /**
+                     * Determine if we have enough remaining width, and apply it to the current column, this results in
+                     * a subsequent column always receiving any additional width from the previous column
+                     */
+                    if (resizeUtils.getSmallestColumnWidth(newGridSize)
+                        === resizeUtils.getAcceptedColumnWidth(remainingWidth.toString(), newGridSize)
+                    ) {
+                        const widthWithRemaining = resizeUtils.getAcceptedColumnWidth(
+                            (parseFloat(newWidth) + remainingWidth).toString(),
+                            newGridSize,
+                        );
+                        if (widthWithRemaining > 0) {
+                            newWidth = widthWithRemaining
+                                .toFixed(Math.round(100 / widthWithRemaining) !== 100 / widthWithRemaining ? 8 : 0);
+                            remainingWidth = 0;
+                        }
+                    }
+
+                    totalNewWidths += parseFloat(newWidth);
+                    updateColumnWidth(column, parseFloat(newWidth));
                 }
+                (column.preview as ColumnPreview).updateDisplayLabel();
 
-                totalNewWidths += parseFloat(newWidth);
-                updateColumnWidth(column, parseFloat(newWidth));
-            }
-            (column.preview as ColumnPreview).updateDisplayLabel();
-        },
+            });
+            },
     );
 
-    // persist new grid size so upcoming calls to get column widths are calculated correctly
     columnGroup.dataStore.set("grid_size", newGridSize);
     columnGroup.dataStore.unset("initial_grid_size");
-
-    // apply leftover columns if the new grid size did not distribute evenly into existing columns
-    if (Math.round(resizeUtils.getColumnsWidth()) < 100) {
-        applyLeftoverColumns(columnGroup, newGridSize);
-    }
+    columnGroup.getChildren()().forEach(
+        (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
+            const resizeUtils = columnLine.preview.getResizeUtils();
+            if (Math.round(resizeUtils.getColumnsWidth()) < 100) {
+                applyLeftoverColumnsInColumnLine(columnLine, newGridSize);
+            }
+        },
+    );
 }
 
 /**
@@ -246,6 +271,33 @@ function applyLeftoverColumns(columnGroup: ContentTypeCollectionInterface<Column
     }
 }
 
+/**
+ * Make sure the full grid size is distributed across the columns
+ *
+ * @param {ContentTypeCollectionInterface<Preview>} columnGroup
+ * @param {number} newGridSize
+ */
+function applyLeftoverColumnsInColumnLine(
+    columnLine: ContentTypeCollectionInterface<ColumnLinePreview>,
+    newGridSize: number,
+) {
+    const resizeUtils = columnLine.preview.getResizeUtils();
+    const minColWidth = parseFloat((100 / newGridSize).toString()).toFixed(
+        Math.round(100 / newGridSize) !== 100 / newGridSize ? 8 : 0,
+    );
+    let column: ContentTypeCollectionInterface<ColumnPreview>;
+    for (column of (columnLine.getChildren()() as Array<ContentTypeCollectionInterface<ColumnPreview>>)) {
+        if (Math.round(resizeUtils.getColumnsWidth()) < 100) {
+            updateColumnWidth(
+                column,
+                parseFloat(resizeUtils.getColumnWidth(column).toString()) + parseFloat(minColWidth),
+            );
+        } else {
+            break;
+        }
+    }
+}
+
 export class GridSizeError extends Error {
     constructor(m: string) {
         super(m);
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts
index 186b4d04795..45ae20d3e00 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
@@ -9,6 +9,7 @@ import $t from "mage/translate";
 import HideShowOption from "Magento_PageBuilder/js/content-type-menu/hide-show-option";
 import {OptionsInterface} from "Magento_PageBuilder/js/content-type-menu/option.types";
 import ContentTypeInterface from "Magento_PageBuilder/js/content-type.types";
+import ColumnLinePreview from "Magento_PageBuilder/js/content-type/column-line/preview";
 import events from "Magento_PageBuilder/js/events";
 import _ from "underscore";
 import Config from "../../config";
@@ -20,6 +21,7 @@ import {DataObject} from "../../data-store";
 import {moveContentType} from "../../drag-drop/move-content-type";
 import {getDraggedContentTypeConfig} from "../../drag-drop/registry";
 import {hiddenClass} from "../../drag-drop/sortable";
+import checkStageFullScreen from "../../utils/check-stage-full-screen";
 import {createStyleSheet} from "../../utils/create-stylesheet";
 import {default as ColumnGroupPreview} from "../column-group/preview";
 import {BindResizeHandleEventParamsInterface, InitElementEventParamsInterface} from "../column/column-events.types";
@@ -29,13 +31,17 @@ import Resize, {
     getRoundedColumnWidth, updateColumnWidth,
 } from "../column/resize";
 import {
+    ContentTypeAfterRenderEventParamsInterface,
     ContentTypeDroppedCreateEventParamsInterface,
     ContentTypeRemovedEventParamsInterface,
 } from "../content-type-events.types";
 import ObservableUpdater from "../observable-updater";
 import PreviewCollection from "../preview-collection";
-import {calculateDropPositions, DropPosition} from "./drag-and-drop";
-import {createColumn} from "./factory";
+import {
+    calculateDropPositions,
+    DropPosition,
+} from "./drag-and-drop";
+import {createColumn, createColumnLine} from "./factory";
 import {getDefaultGridSize, getMaxGridSize, GridSizeError, resizeGrid} from "./grid-size";
 import {getDragColumn, removeDragColumn, setDragColumn} from "./registry";
 
@@ -121,13 +127,6 @@ export default class Preview extends PreviewCollection {
             }
         });
 
-        // Listen for resizing events from child columns
-        events.on("column:resizeHandleBindAfter", (args: BindResizeHandleEventParamsInterface) => {
-            // Does the events content type match the previews column group?
-            if (args.columnGroup.id === this.contentType.id) {
-                this.registerResizeHandle(args.column, args.handle);
-            }
-        });
         events.on("column:initializeAfter", (args: InitElementEventParamsInterface) => {
             // Does the events parent match the previews column group?
             if (args.columnGroup.id === this.contentType.id) {
@@ -135,6 +134,22 @@ export default class Preview extends PreviewCollection {
             }
         });
 
+        events.on(
+            `stage:${this.contentType.stageId}:readyAfter`,
+            this.moveContentsToNewColumnGroup.bind(this),
+        );
+
+        events.on("column-group:renderAfter", (args: ContentTypeAfterRenderEventParamsInterface) => {
+            if (args.contentType.id === this.contentType.id) {
+                if (!this.hasColumnLine(args.contentType)) {
+                    args.element.classList.add("no-column-line");
+                } else  {
+                    args.element.classList.remove("no-column-line");
+                    args.element.classList.add("with-column-line");
+                }
+            }
+        });
+
         this.contentType.children.subscribe(
             _.debounce(
                 this.removeIfEmpty.bind(this),
@@ -159,7 +174,7 @@ export default class Preview extends PreviewCollection {
 
         const appearance = this.contentType.dataStore.get("appearance") ? this.contentType.dataStore.get("appearance") : "default";
         this.contentType.dataStore.set("appearance", appearance);
-        this.contentType.dataStore.set("non_empty_column_count", numCols - numEmptyColumns);
+        this.contentType.dataStore.set("non_empty_column_count", this.getNonEmptyColumnCount());
         this.contentType.dataStore.set("max_grid_size", getMaxGridSize());
         this.contentType.dataStore.set("initial_grid_size", this.contentType.dataStore.get("grid_size"));
         super.openEdit();
@@ -172,10 +187,10 @@ export default class Preview extends PreviewCollection {
         super.bindEvents();
 
         if (Config.getContentTypeConfig("column")) {
-            events.on("column-group:dropAfter", (args: ContentTypeDroppedCreateEventParamsInterface) => {
+            events.on("column-group:dropAfter", (args: any) => {
                 if (args.id === this.contentType.id) {
                     this.setDefaultGridSizeOnColumnGroup();
-                    this.createColumns();
+                    this.addDefaultColumnLine(args);
                 }
             });
         }
@@ -223,10 +238,36 @@ export default class Preview extends PreviewCollection {
                 this.contentType.addChild(columns[0], 0);
                 this.contentType.addChild(columns[1], 1);
                 this.fireMountEvent(this.contentType, columns[0], columns[1]);
-                },
+            },
         );
     }
 
+    public addDefaultColumnLine(args: any): void {
+        createContentType(
+            Config.getContentTypeConfig("column-line"),
+            this.contentType,
+            this.contentType.stageId,
+        ).then((columnLine: ContentTypeCollectionInterface ) => {
+            this.contentType.addChild(columnLine, 0);
+            if (args.columnGroupWithoutColumnLine === undefined) {
+                events.trigger(columnLine.config.name + ":dropAfter", {id: columnLine.id, columnLine});
+            } else {
+                // Move children of this column group without column line as descendant of new
+                // column group that has a column line
+                const children = args.columnGroupWithoutColumnLine.getChildren()() as ContentTypeCollectionInterface[];
+                let index = 0;
+                children.forEach((child) => {
+                    setTimeout(() =>
+                        {
+                            moveContentType(child, index++, columnLine);
+                        },
+                        250);
+                });
+            }
+            this.fireMountEvent(this.contentType, columnLine);
+        });
+    }
+
     /**
      * Use the conditional remove to disable the option when the content type has a single child
      *
@@ -418,6 +459,7 @@ export default class Preview extends PreviewCollection {
 
     /**
      * Init the drop placeholder
+     * @deprecated - dropPlaceholder functionality moved to column-line
      *
      * @param {Element} element
      */
@@ -445,7 +487,7 @@ export default class Preview extends PreviewCollection {
 
     /**
      * Register a resize handle within a child column
-     *
+     * @deprecated
      * @param {ContentTypeCollectionInterface<ColumnPreview>} column
      * @param {JQuery} handle
      */
@@ -457,10 +499,7 @@ export default class Preview extends PreviewCollection {
             this.resizing(true);
 
             this.resizeColumnInstance = column;
-            this.resizeColumnWidths = this.resizeUtils.determineColumnWidths(
-                this.resizeColumnInstance,
-                groupPosition,
-            );
+            this.resizeColumnWidths = this.resizeUtils.determineColumnWidths(this.resizeColumnInstance, groupPosition);
             this.resizeMaxGhostWidth = determineMaxGhostWidth(this.resizeColumnWidths);
 
             // Force the cursor to resizing
@@ -510,7 +549,6 @@ export default class Preview extends PreviewCollection {
                 setDragColumn((columnInstance.contentType as ContentTypeCollectionInterface<ColumnPreview>));
                 this.dropPositions = calculateDropPositions(this.contentType);
                 this.startDragEvent = event;
-
                 events.trigger("column:dragStart", {
                     column: columnInstance,
                     stageId: this.contentType.stageId,
@@ -530,7 +568,6 @@ export default class Preview extends PreviewCollection {
 
                 removeDragColumn();
 
-                this.dropPlaceholder.removeClass("left right");
                 this.movePlaceholder.removeClass("active");
                 this.startDragEvent = null;
 
@@ -581,6 +618,62 @@ export default class Preview extends PreviewCollection {
         }
     }
 
+    /**
+     * @param {ContentTypeInterface | ContentTypeCollectionInterface} contentType
+     * @private
+     */
+    private hasColumnLine(contentType: ContentTypeInterface | ContentTypeCollectionInterface): boolean {
+        const children = this.contentType.getChildren()();
+        let hasColumnLine = false;
+        if (children.length === 0 && checkStageFullScreen(contentType.stageId)) {
+            // new column group, so it has a column line
+            hasColumnLine = true;
+        }
+        children.forEach((child) => {
+            if (child.config.name === "column-line") {
+                hasColumnLine = true;
+            }
+        });
+        return hasColumnLine;
+    }
+
+    /**
+     * If the column group does not have a column line, move contents to a new column group with a column line
+     */
+    private moveContentsToNewColumnGroup(): void {
+        if (this.hasColumnLine(this.contentType)) {
+            // This column-group already has a column line. Don't need to add one.
+            return;
+        }
+        const indexToInsertNewColumnGroupAt = this.getCurrentIndexInParent();
+        createContentType(
+            Config.getContentTypeConfig("column-group"),
+            this.contentType.parentContentType,
+            this.contentType.stageId,
+        ).then((columnGroup: ContentTypeCollectionInterface ) => {
+            this.contentType.parentContentType.addChild(columnGroup, indexToInsertNewColumnGroupAt);
+            events.trigger(columnGroup.config.name + ":dropAfter", {id: columnGroup.id, columnGroup,
+            columnGroupWithoutColumnLine: this.contentType});
+            this.fireMountEvent(this.contentType, columnGroup);
+        });
+    }
+
+    /**
+     * @private return index of current content type in parent
+     */
+    private getCurrentIndexInParent(): number {
+        const parentContentType = this.contentType.parentContentType;
+        let currentIndex = 0;
+        for (const sibling of this.contentType.parentContentType.getChildren()()) {
+            if (sibling.id !== this.contentType.id) {
+                currentIndex++;
+                continue;
+            }
+            break;
+        }
+        return currentIndex;
+    }
+
     /**
      * Fire the mount event for content types
      *
@@ -632,12 +725,11 @@ export default class Preview extends PreviewCollection {
         this.resizeLeftLastColumnShrunk = this.resizeRightLastColumnShrunk = null;
         this.dropPositions = [];
 
-        this.unsetResizingColumns();
+        // this.unsetResizingColumns();
 
         // Change the cursor back
         $("body").css("cursor", "");
 
-        this.dropPlaceholder.removeClass("left right");
         this.movePlaceholder.css("left", "").removeClass("active");
         this.resizeGhost.removeClass("active");
 
@@ -667,22 +759,17 @@ export default class Preview extends PreviewCollection {
 
             if (this.eventIntersectsGroup(event, groupPosition)) {
                 intersects = true;
+                // @todo make column re-sizing work
                 this.onResizingMouseMove(event, group, groupPosition);
-                this.onDraggingMouseMove(event, group, groupPosition);
-                this.onDroppingMouseMove(event, group, groupPosition);
             } else {
                 intersects = false;
                 this.groupPositionCache = null;
                 this.dropPosition = null;
-                this.dropPlaceholder.removeClass("left right");
                 this.movePlaceholder.css("left", "").removeClass("active");
             }
         }).on("mouseup touchend", () => {
-            if (intersects) {
-                this.handleMouseUp();
-            }
-            intersects = false;
 
+            intersects = false;
             this.dropPosition = null;
             this.endAllInteractions();
 
@@ -699,6 +786,7 @@ export default class Preview extends PreviewCollection {
 
     /**
      * Handle the mouse up action, either adding a new column or moving an existing
+     * @deprecated
      */
     private handleMouseUp(): void {
         if (this.dropOverElement && this.dropPosition) {
@@ -884,7 +972,7 @@ export default class Preview extends PreviewCollection {
 
     /**
      * Handle a column being dragged around the group
-     *
+     * @deprecated - this is now handled in column-line/preview onDraggingMouseMove
      * @param {JQueryEventObject} event
      * @param {JQuery} group
      * @param {GroupPositionCache} groupPosition
@@ -918,7 +1006,6 @@ export default class Preview extends PreviewCollection {
                 }
 
                 if (this.movePosition) {
-                    this.dropPlaceholder.removeClass("left right");
                     this.movePlaceholder.css({
                         left: (this.movePosition.placement === "left" ? this.movePosition.left : ""),
                         right: (this.movePosition.placement === "right"
@@ -937,15 +1024,6 @@ export default class Preview extends PreviewCollection {
                 if (this.movePosition) {
                     const classToRemove = (this.movePosition.placement === "left" ? "right" : "left");
                     this.movePlaceholder.removeClass("active");
-                    this.dropPlaceholder.removeClass(classToRemove).css({
-                        left: (this.movePosition.placement === "left" ? this.movePosition.left : ""),
-                        right: (this.movePosition.placement === "right" ?
-                                groupPosition.width - this.movePosition.right : ""
-                        ),
-                        width: groupPosition.width / this.resizeUtils.getGridSize() + "px",
-                    }).addClass(this.movePosition.placement);
-                } else {
-                    this.dropPlaceholder.removeClass("left right");
                 }
             }
         }
@@ -957,6 +1035,7 @@ export default class Preview extends PreviewCollection {
      * @param {JQueryEventObject} event
      * @param {JQuery} group
      * @param {GroupPositionCache} groupPosition
+     * @deprecated now handled in column-line/preview
      */
     private onDroppingMouseMove(event: JQueryEventObject, group: JQuery, groupPosition: GroupPositionCache): void {
         const elementChildrenParent = group.parents(".element-children");
@@ -976,21 +1055,12 @@ export default class Preview extends PreviewCollection {
                 return currentX > position.left && currentX <= position.right && position.canShrink;
             });
 
-            if (this.dropPosition) {
-                this.dropPlaceholder.removeClass("left right").css({
-                    left: (this.dropPosition.placement === "left" ? this.dropPosition.left : ""),
-                    right:
-                        (this.dropPosition.placement === "right" ? groupPosition.width - this.dropPosition.right : ""),
-                    width: groupPosition.width / this.resizeUtils.getGridSize() + "px",
-                }).addClass(this.dropPosition.placement);
-            }
         } else if (this.dropOverElement) {
             // Re-enable the column group sortable instance
             if (elementChildrenParent.data("ui-sortable")) {
                 elementChildrenParent.sortable("option", "disabled", false);
             }
             this.dropPosition = null;
-            this.dropPlaceholder.removeClass("left right");
         }
     }
 
@@ -1006,7 +1076,6 @@ export default class Preview extends PreviewCollection {
         group.droppable({
             deactivate() {
                 self.dropOverElement = null;
-                self.dropPlaceholder.removeClass("left right");
 
                 _.defer(() => {
                     // Re-enable the column group sortable instance & all children sortable instances
@@ -1044,20 +1113,14 @@ export default class Preview extends PreviewCollection {
             },
             drop() {
                 self.dropPositions = [];
-                self.dropPlaceholder.removeClass("left right");
             },
             out() {
                 self.dropOverElement = null;
-                self.dropPlaceholder.removeClass("left right");
             },
             over() {
                 // Is the element currently being dragged a column group?
                 if (getDraggedContentTypeConfig() === Config.getContentTypeConfig("column-group")) {
                     // Always calculate drop positions when an element is dragged over
-                    self.dropPositions = calculateDropPositions(
-                        self.contentType as ContentTypeCollectionInterface<ColumnGroupPreview>,
-                    );
-
                     self.dropOverElement = true;
                 } else {
                     self.dropOverElement = null;
@@ -1146,6 +1209,8 @@ export default class Preview extends PreviewCollection {
      * @param {number} newGridSize
      */
     private recordGridResize(newGridSize: number): void {
+        // @todo evaluate utility of having a grid size history
+        return;
         if (!this.gridSizeHistory.has(newGridSize)) {
             const columnWidths: number[] = [];
             this.contentType.getChildren()().forEach(
@@ -1155,6 +1220,33 @@ export default class Preview extends PreviewCollection {
             this.gridSizeHistory.set(newGridSize, columnWidths);
         }
     }
+
+    /**
+     * Figure out the maximum number of non-empty columns in various column lines
+     * @private
+     */
+    private getNonEmptyColumnCount(): number {
+
+        let nonEmptyColumnCount = 0;
+        this.contentType.getChildren()().forEach(
+            (columnLine: ContentTypeCollectionInterface<ColumnLinePreview>, index: number) => {
+                let numEmptyColumns = 0;
+                const numCols = columnLine.getChildren()().length;
+                columnLine.getChildren()().forEach(
+                        (column: ContentTypeCollectionInterface<ColumnPreview>) => {
+                            if (column.getChildren()().length === 0) {
+                                numEmptyColumns++;
+                            }
+                        });
+
+                if (numCols - numEmptyColumns > nonEmptyColumnCount) {
+                    nonEmptyColumnCount = numCols - numEmptyColumns;
+                }
+
+            });
+
+        return nonEmptyColumnCount;
+    }
 }
 
 export interface GroupPositionCache {
@@ -1166,6 +1258,15 @@ export interface GroupPositionCache {
     outerHeight: number;
 }
 
+export interface LinePositionCache {
+    left: number;
+    top: number;
+    width: number;
+    height: number;
+    outerWidth: number;
+    outerHeight: number;
+}
+
 export interface ResizeHistory {
     left: ResizeHistoryItem[];
     right: ResizeHistoryItem[];
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/registry.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/registry.ts
index fddad43faa0..e4bc325d85f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/registry.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-group/registry.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-line/drag-and-drop.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-line/drag-and-drop.ts
new file mode 100644
index 00000000000..b5da5150643
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-line/drag-and-drop.ts
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+
+import ContentTypeCollectionInterface from "../../content-type-collection.types";
+import ColumnGroupPreview from "../column-group/preview";
+import ColumnPreview from "../column/preview";
+import ColumnLinePreview from "./preview";
+
+/**
+ * Calculate the drop positions of a column group
+ *
+ * @param {ContentTypeCollectionInterface} group
+ * @returns {any[]}
+ */
+export function calculateDropPositions(line: ContentTypeCollectionInterface<ColumnLinePreview>): DropPosition[] {
+    const resizeUtils = line.preview.getResizeUtils();
+    const dropPositions: any[] = [];
+    line.children().forEach((column: ContentTypeCollectionInterface<ColumnPreview>, index: number) => {
+        const left = column.preview.element.position().left;
+        const width = column.preview.element.outerWidth(true);
+        const canShrink = resizeUtils.getAcceptedColumnWidth(resizeUtils.getColumnWidth(column).toString()) >
+            resizeUtils.getSmallestColumnWidth();
+        dropPositions.push(
+            {
+                affectedColumn: column, canShrink,
+                insertIndex: index, left,
+                placement: "left",
+                right: left + (width / 2),
+            },
+            {
+                affectedColumn: column, canShrink,
+                insertIndex: index + 1,
+                left: left + (width / 2),
+                placement: "right",
+                right: left + width,
+            },
+        );
+    });
+    return dropPositions;
+}
+
+export interface DropPosition {
+    left: number;
+    right: number;
+    insertIndex: number;
+    placement: string;
+    affectedColumn: ContentTypeCollectionInterface<ColumnPreview>;
+    canShrink: boolean;
+    orientation: string;
+}
+
+export interface ColumnLineDropPosition {
+    top: number;
+    bottom: number;
+    insertIndex: number;
+    affectedColumnLine: ContentTypeCollectionInterface<ColumnLinePreview>;
+
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-line/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-line/preview.ts
new file mode 100644
index 00000000000..8348cde8998
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column-line/preview.ts
@@ -0,0 +1,1286 @@
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+
+import $ from "jquery";
+import ko from "knockout";
+import ColumnLine from "Magento_PageBuilder/js/content-type-collection";
+import ContentTypeConfigInterface from "Magento_PageBuilder/js/content-type-config.types";
+import createContentType from "Magento_PageBuilder/js/content-type-factory";
+import ContentTypeInterface from "Magento_PageBuilder/js/content-type.types";
+import {createColumn, createColumnLine} from "Magento_PageBuilder/js/content-type/column-group/factory";
+import {
+    ColumnWidth,
+    GroupPositionCache,
+    LinePositionCache,
+    MaxGhostWidth,
+    ResizeHistory,
+} from "Magento_PageBuilder/js/content-type/column-group/preview";
+import ColumnGroupPreview from "Magento_PageBuilder/js/content-type/column-group/preview";
+import {
+    getDragColumn,
+    removeDragColumn,
+    setDragColumn,
+} from "Magento_PageBuilder/js/content-type/column-group/registry";
+import {
+    BindResizeHandleEventParamsInterface,
+    InitElementEventParamsInterface,
+} from "Magento_PageBuilder/js/content-type/column/column-events.types";
+import ColumnPreview from "Magento_PageBuilder/js/content-type/column/preview";
+import {
+    ContentTypeDroppedCreateEventParamsInterface,
+    ContentTypeRemovedEventParamsInterface,
+} from "Magento_PageBuilder/js/content-type/content-type-events.types";
+import ObservableUpdater from "Magento_PageBuilder/js/content-type/observable-updater";
+import {moveContentType} from "Magento_PageBuilder/js/drag-drop/move-content-type";
+import {getDraggedContentTypeConfig} from "Magento_PageBuilder/js/drag-drop/registry";
+import {hiddenClass} from "Magento_PageBuilder/js/drag-drop/sortable";
+import events from "Magento_PageBuilder/js/events";
+import {createStyleSheet} from "Magento_PageBuilder/js/utils/create-stylesheet";
+import _ from "underscore";
+import Config from "../../config";
+import ContentTypeCollectionInterface from "../../content-type-collection.types";
+import {getDefaultGridSize} from "../column-group/grid-size";
+import {default as ColumnLinePreview} from "../column-line/preview";
+import Resize, {
+    comparator,
+    determineMaxGhostWidth,
+    getAdjacentColumn,
+    getColumnIndexInLine,
+    getRoundedColumnWidth,
+    updateColumnWidth,
+} from "../column/resize";
+import PreviewCollection from "../preview-collection";
+import {calculateDropPositions, DropPosition} from "./drag-and-drop";
+
+/**
+ * @api
+ */
+export default class Preview extends PreviewCollection {
+    public contentType: ContentTypeCollectionInterface<ColumnLinePreview>;
+    public resizing: KnockoutObservable<boolean> = ko.observable(false);
+    public gridSizeArray: KnockoutObservableArray<any[]> = ko.observableArray([]);
+    public element: JQuery;
+    private dropPlaceholder: JQuery;
+    private movePlaceholder: any;
+    private dropPositions: DropPosition[] = [];
+    private dropPosition: DropPosition;
+    private startDragEvent: JQueryEventObject;
+    private movePosition: DropPosition;
+    private dropOverElement: boolean;
+    private resizeUtils: Resize;
+    private linePositionCache: LinePositionCache;
+    private columnLineDropPlaceholder: JQuery;
+    private resizeColumnInstance: ContentTypeCollectionInterface<ColumnPreview>;
+    private resizeColumnWidths: ColumnWidth[];
+    private resizeMaxGhostWidth: MaxGhostWidth;
+    private resizeHistory: ResizeHistory = {
+        left: [],
+        right: [],
+    };
+    private resizeLastPosition: number;
+    private resizeLastColumnInPair: string;
+    private resizeMouseDown: boolean;
+    private interactionLevel: number = 0;
+    private lineDropperHeight: number = 50;
+    private resizeGhost: JQuery;
+    private resizeLeftLastColumnShrunk: ContentTypeCollectionInterface<ColumnPreview>;
+    private resizeRightLastColumnShrunk: ContentTypeCollectionInterface<ColumnPreview>;
+    private columnLineBottomDropPlaceholder: JQuery;
+
+    /**
+     *
+     * @param {ContentTypeCollection} contentType
+     * @param {ContentTypeConfigInterface} config
+     * @param {ObservableUpdater} observableUpdater
+     */
+    constructor(
+        contentType: ColumnLine,
+        config: ContentTypeConfigInterface,
+        observableUpdater: ObservableUpdater,
+    ) {
+        super(contentType, config, observableUpdater);
+        this.resizeUtils = new Resize(this.contentType.parentContentType, this.contentType);
+
+        events.on("contentType:removeAfter", (args: ContentTypeRemovedEventParamsInterface) => {
+            if (args.parentContentType && args.parentContentType.id === this.contentType.id) {
+                _.defer(() => {
+                    this.spreadWidth(args.index);
+                });
+            }
+        });
+
+        // Listen for resizing events from child columns
+        events.on("column:resizeHandleBindAfter", (args: BindResizeHandleEventParamsInterface) => {
+            // Does the events content type match the previews column group?
+            if (args.columnLine.id === this.contentType.id) {
+                this.registerResizeHandle(args.column, args.handle);
+            }
+        });
+        events.on("column:initializeAfter", (args: InitElementEventParamsInterface) => {
+            // Does the events parent match the previews column group?
+            if (args.columnGroup.id === this.contentType.id) {
+                this.bindDraggable(args.column);
+            }
+        });
+
+        const parentPreview = this.contentType.parentContentType.preview as ColumnGroupPreview;
+        this.gridSizeArray(parentPreview.gridSizeArray());
+        parentPreview.gridSizeArray.subscribe((gridSize: any[]) => {
+            this.gridSizeArray(gridSize);
+        });
+
+        this.contentType.children.subscribe(
+            _.debounce(
+                this.removeIfEmpty.bind(this),
+                50,
+            ),
+        );
+    }
+
+    /**
+     * Bind events
+     */
+    public bindEvents() {
+        super.bindEvents();
+
+        if (Config.getContentTypeConfig("column")) {
+            events.on("column-line:dropAfter", (args: ContentTypeDroppedCreateEventParamsInterface) => {
+                if (args.id === this.contentType.id) {
+                     this.createColumns();
+                }
+            });
+        }
+
+        events.on("column:initializeAfter", (args: InitElementEventParamsInterface) => {
+            // Does the events parent match the previews column group?
+            if (args.columnLine.id === this.contentType.id) {
+                this.bindDraggable(args.column);
+
+            }
+        });
+    }
+
+    /**
+     * Init the droppable & resizing interactions
+     *
+     * @param line
+     */
+    public bindInteractions(line: Element) {
+        this.element = $(line);
+        this.initDroppable(this.element);
+        this.initMouseMove(this.element);
+
+        // Handle the mouse leaving the window
+      //  $("body").mouseleave(this.endAllInteractions.bind(this));
+    }
+
+    /**
+     * Init the drop placeholder
+     *
+     * @param {Element} element
+     */
+    public bindDropPlaceholder(element: Element) {
+        this.dropPlaceholder = $(element);
+    }
+
+    /**
+     * Init the drop placeholder
+     *
+     * @param {Element} element
+     */
+    public bindColumnLineBottomDropPlaceholder(element: Element) {
+        this.columnLineBottomDropPlaceholder = $(element);
+    }
+
+    /**
+     * Init the drop placeholder
+     *
+     * @param {Element} element
+     */
+    public bindColumnLineDropPlaceholder(element: Element) {
+        this.columnLineDropPlaceholder = $(element);
+    }
+
+    /**
+     * Init the move placeholder
+     *
+     * @param {Element} element
+     */
+    public bindMovePlaceholder(element: Element) {
+        this.movePlaceholder = $(element);
+    }
+
+    /**
+     * Retrieve the ghost element from the template
+     *
+     * @param {Element} ghost
+     */
+    public bindGhost(ghost: Element) {
+        this.resizeGhost = $(ghost);
+    }
+
+    /**
+     * Retrieve the resize utils
+     *
+     * @returns {Resize}
+     */
+    public getResizeUtils(): Resize {
+        return this.resizeUtils;
+    }
+
+    /**
+     * Bind draggable instances to the child columns
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     */
+    public bindDraggable(column: ContentTypeCollectionInterface<ColumnPreview>): void {
+        column.preview.element.draggable({
+            appendTo: "body",
+            containment: "body",
+            cursor: "-webkit-grabbing",
+            handle: ".move-column",
+            revertDuration: 250,
+            helper() {
+                const helper = $(this).clone();
+                helper.css({
+                    height: $(this).outerHeight() + "px",
+                    minHeight: 0,
+                    opacity: 0.5,
+                    pointerEvents: "none",
+                    width: $(this).outerWidth() + "px",
+                    zIndex: 5000,
+                });
+                return helper;
+            },
+            start: (event: JQueryEventObject) => {
+                const columnInstance: ColumnPreview = ko.dataFor($(event.target)[0]);
+                // Use the global state as columns can be dragged between groups
+                setDragColumn((columnInstance.contentType as ContentTypeCollectionInterface<ColumnPreview>));
+                this.dropPositions = calculateDropPositions(this.contentType);
+                this.startDragEvent = event;
+
+                events.trigger("column:dragStart", {
+                    column: columnInstance,
+                    stageId: this.contentType.stageId,
+                });
+                events.trigger("stage:interactionStart", {stageId: this.contentType.stageId});
+            },
+            stop: () => {
+                const draggedColumn = getDragColumn();
+                if (this.movePosition && draggedColumn) {
+                    // Check if we're moving within the same group, even though this function will
+                    // only ever run on the group that bound the draggable event
+                    if (draggedColumn.parentContentType === this.contentType) {
+                        this.onColumnSort(draggedColumn, this.movePosition.insertIndex);
+                        this.movePosition = null;
+                        // todo see from column group
+                    }
+                }
+
+                removeDragColumn();
+
+                this.dropPlaceholder.removeClass("left right");
+
+                this.movePlaceholder.removeClass("active");
+                this.movePosition = null;
+                this.startDragEvent = null;
+
+                events.trigger("column:dragStop", {
+                    column: draggedColumn,
+                    stageId: this.contentType.stageId,
+                });
+                events.trigger("stage:interactionStop", {stageId: this.contentType.stageId});
+            },
+        });
+    }
+
+    /**
+     * Handle a column being sorted into a new position in the column line
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @param {number} newIndex
+     */
+    public onColumnSort(column: ContentTypeCollectionInterface<ColumnPreview>, newIndex: number) {
+        const currentIndex = getColumnIndexInLine(column);
+        if (currentIndex !== newIndex) {
+            if (currentIndex < newIndex) {
+                // As we're moving an array item the keys all reduce by 1
+                --newIndex;
+            }
+
+            // Move the content type
+            moveContentType(column, newIndex);
+        }
+    }
+
+    /**
+     * Handle a new column being dropped into the group
+     *
+     * @param {DropPosition} dropPosition
+     */
+    private onNewColumnDrop(dropPosition: DropPosition) {
+        // Create our new column
+        createColumn(
+            this.contentType,
+            this.resizeUtils.getSmallestColumnWidth(),
+            dropPosition.insertIndex,
+        ).then(() => {
+            const newWidth = this.resizeUtils.getAcceptedColumnWidth(
+                (this.resizeUtils.getColumnWidth(dropPosition.affectedColumn) -
+                    this.resizeUtils.getSmallestColumnWidth()).toString(),
+            );
+
+            // Reduce the affected columns width by the smallest column width
+            updateColumnWidth(dropPosition.affectedColumn, newWidth);
+        });
+    }
+
+    /**
+     * Handle an existing column being dropped into a different column line
+     *
+     * @param {DropPosition} movePosition
+     */
+    private onExistingColumnDrop(movePosition: DropPosition) {
+        const column = getDragColumn();
+        const sourceLinePreview = column.parentContentType.preview as ColumnLinePreview;
+        let modifyOldNeighbour: ContentTypeCollectionInterface<ColumnPreview>;
+
+        // Determine which old neighbour we should modify
+        const oldWidth = sourceLinePreview.getResizeUtils().getColumnWidth(column);
+        let direction = "+1";
+
+        // Retrieve the adjacent column either +1 or -1
+        if (getAdjacentColumn(column, "+1")) {
+            modifyOldNeighbour = getAdjacentColumn(column, "+1");
+        } else if (getAdjacentColumn(column, "-1")) {
+            direction = "-1";
+            modifyOldNeighbour = getAdjacentColumn(column, "-1");
+        }
+
+        // Modify the old neighbour
+        let oldNeighbourWidth = 100;
+        if (modifyOldNeighbour) {
+            oldNeighbourWidth = sourceLinePreview.getResizeUtils().getAcceptedColumnWidth(
+                (oldWidth + sourceLinePreview.getResizeUtils().getColumnWidth(modifyOldNeighbour)).toString(),
+            );
+
+        }
+
+        // Move the content type
+        if (this.columnLineDropPlaceholder.hasClass("active")) {
+            // if new column line placeholders are visible, add new column line and move column there
+            createColumnLine(
+                this.contentType.parentContentType,
+                this.resizeUtils.getSmallestColumnWidth(),
+                this.getNewColumnLineIndex(),
+            ).then((columnLine) => {
+
+                moveContentType(column, 0, columnLine);
+                updateColumnWidth(column, 100);
+                if (modifyOldNeighbour) {
+                    updateColumnWidth(modifyOldNeighbour, oldNeighbourWidth);
+                }
+                this.fireMountEvent(this.contentType, column);
+
+            });
+        } else if (this.columnLineBottomDropPlaceholder.hasClass("active")) {
+            // if new column line placeholders are visible, add new column line and move column there
+            createColumnLine(
+                this.contentType.parentContentType,
+                this.resizeUtils.getSmallestColumnWidth(),
+                this.getNewColumnLineIndex(),
+            ).then((columnLine) => {
+
+                moveContentType(column, 0, columnLine);
+                updateColumnWidth(column, 100);
+                if (modifyOldNeighbour) {
+                    updateColumnWidth(modifyOldNeighbour, oldNeighbourWidth);
+                }
+                this.fireMountEvent(this.contentType, column);
+
+            });
+        } else {
+            moveContentType(column, movePosition.insertIndex, this.contentType);
+            if (modifyOldNeighbour) {
+                updateColumnWidth(modifyOldNeighbour, oldNeighbourWidth);
+            }
+            let newNeighbourWidth = this.resizeUtils.getAcceptedColumnWidth(
+                (this.resizeUtils.getColumnWidth(movePosition.affectedColumn) -
+                    oldWidth).toString(),
+            );
+            let newNeighbour = movePosition.affectedColumn;
+            let totalWidthAdjusted = 0;
+            updateColumnWidth(column, oldWidth);
+            while (true) {
+                // take width from all neighbours in one direction till the entire width is obtained
+                if (newNeighbourWidth <= 0) {
+                    newNeighbourWidth = this.resizeUtils.getSmallestColumnWidth();
+                    const originalWidthOfNeighbour = this.resizeUtils.getColumnWidth(newNeighbour);
+                    updateColumnWidth(newNeighbour, newNeighbourWidth);
+                    totalWidthAdjusted += (originalWidthOfNeighbour - newNeighbourWidth);
+                } else {
+                    updateColumnWidth(newNeighbour, newNeighbourWidth);
+                    break;
+                }
+
+                if (direction === "+1") {
+                    newNeighbour = getAdjacentColumn(newNeighbour, "+1");
+                } else {
+                    newNeighbour = getAdjacentColumn(newNeighbour, "-1");
+                }
+
+                if (!newNeighbour) {
+                    updateColumnWidth(column, totalWidthAdjusted);
+                    break;
+                }
+                const neighbourExistingWidth = this.resizeUtils.getColumnWidth(newNeighbour);
+                newNeighbourWidth = neighbourExistingWidth - (oldWidth - totalWidthAdjusted);
+                if (newNeighbourWidth < 0.001) {
+                    newNeighbourWidth = 0;
+                }
+
+            }
+            let totalWidth = 0;
+            this.contentType.children().forEach((columnChild: ContentTypeCollectionInterface<ColumnPreview>) => {
+                totalWidth += this.resizeUtils.getColumnWidth(columnChild);
+            });
+            if (totalWidth > 100) {
+                // take extra width from newly moved column
+                updateColumnWidth(column, this.resizeUtils.getColumnWidth(column) - (totalWidth - 100));
+            }
+        }
+
+    }
+
+    /**
+     * Init the resizing events on the group
+     *
+     * @param {JQuery} line
+     */
+    private initMouseMove(line: JQuery): void {
+        let intersects: boolean = false;
+        $(document).on("mousemove touchmove", (event: JQueryEventObject) => {
+            if (line.parents(hiddenClass).length > 0) {
+                return;
+            }
+
+            const linePosition = this.getLinePosition(line);
+
+            // If we're handling a touch event we need to pass through the page X & Y
+            if (event.type === "touchmove") {
+                event.pageX = (event.originalEvent as any).pageX;
+                event.pageY = (event.originalEvent as any).pageY;
+            }
+
+            if (this.eventIntersectsLine(event, linePosition)) {
+                intersects = true;
+                // @todo re-instate onResizingMouseMove
+                this.onResizingMouseMove(event, line, linePosition);
+                this.onDraggingMouseMove(event, line, linePosition);
+                this.onDroppingMouseMove(event, line, linePosition);
+            } else {
+                intersects = false;
+                this.linePositionCache = null;
+                this.dropPosition = null;
+                this.dropPlaceholder.removeClass("left right");
+                this.columnLineDropPlaceholder.removeClass("active");
+                this.columnLineBottomDropPlaceholder.removeClass("active");
+                this.columnLineBottomDropPlaceholder.hide();
+                this.columnLineDropPlaceholder.hide();
+                // @todo combine active and show/hide functionality for columnLineDropPlaceholder
+              //  this.movePlaceholder.css("left", "").removeClass("active");
+            }
+        }).on("mouseup touchend", () => {
+            if (intersects) {
+                this.handleMouseUp();
+            }
+            intersects = false;
+
+            this.dropPosition = null;
+            this.endAllInteractions();
+
+            _.defer(() => {
+                // Re-enable any disabled sortable areas
+                line.find(".ui-sortable").each(function() {
+                    if ($(this).data("ui-sortable")) {
+                        $(this).sortable("option", "disabled", false);
+                    }
+                });
+            });
+        });
+    }
+
+    /**
+     * End all current interactions
+     */
+    private endAllInteractions(): void {
+        if (this.resizing() === true) {
+            for (; this.interactionLevel > 0; this.interactionLevel--) {
+                events.trigger("stage:interactionStop", {stageId: this.contentType.stageId});
+            }
+        }
+        this.linePositionCache = null;
+        this.dropPosition = null;
+        this.dropPlaceholder.removeClass("left right");
+        this.columnLineDropPlaceholder.removeClass("active");
+        this.columnLineBottomDropPlaceholder.removeClass("active");
+        this.columnLineBottomDropPlaceholder.hide();
+        this.columnLineDropPlaceholder.hide();
+        this.resizing(false);
+        this.resizeMouseDown = null;
+        this.resizeLeftLastColumnShrunk = this.resizeRightLastColumnShrunk = null;
+        this.dropPositions = [];
+
+        this.unsetResizingColumns();
+
+        // Change the cursor back
+        $("body").css("cursor", "");
+
+        this.movePlaceholder.css("left", "").removeClass("active");
+        this.resizeGhost.removeClass("active");
+
+        // Reset the line positions cache
+        this.linePositionCache = null;
+    }
+
+    /**
+     * Handle the mouse up action, either adding a new column or moving an existing
+     */
+    private handleMouseUp(): void {
+
+        const self = this;
+        const dragColumn = getDragColumn();
+        if ((this.columnLineDropPlaceholder.hasClass("active")
+            || this.columnLineBottomDropPlaceholder.hasClass("active"))
+        && !dragColumn) {
+
+            createColumnLine(
+                this.contentType.parentContentType,
+                this.resizeUtils.getSmallestColumnWidth(),
+                this.getNewColumnLineIndex(),
+            ).then((columnLine) => {
+                events.trigger(
+                    columnLine.config.name + ":dropAfter",
+                    {id: columnLine.id, columnLine},
+                );
+            });
+            return;
+        }
+
+        if (this.dropOverElement && this.dropPosition) {
+            this.onNewColumnDrop(this.dropPosition);
+            this.dropOverElement = null;
+
+            // Re-enable the parent disabled sortable instance
+            _.defer(() => {
+                $(".element-children.ui-sortable-disabled").each(function() {
+                    $(this).sortable("option", "disabled", false);
+                });
+            });
+        }
+
+        const column = getDragColumn();
+
+        if (this.isColumnBeingMovedToAnotherColumnLine()) {
+            this.onExistingColumnDrop(this.movePosition);
+        }
+
+    }
+
+    /**
+     * Does the current event intersect with the line?
+     *
+     * @param {JQueryEventObject} event
+     * @param {LinePositionCache} groupPosition
+     * @returns {boolean}
+     */
+    private eventIntersectsLine(event: JQueryEventObject, groupPosition: LinePositionCache): boolean {
+        return event.pageY > groupPosition.top &&
+            event.pageY < (groupPosition.top + groupPosition.outerHeight) &&
+            event.pageX > groupPosition.left &&
+            event.pageX < (groupPosition.left + groupPosition.outerWidth);
+    }
+
+    /**
+     * Handle a column being dragged around the group
+     *
+     * @param {JQueryEventObject} event
+     * @param {JQuery} line
+     * @param {LinePositionCache} linePosition
+     */
+    private onDraggingMouseMove(event: JQueryEventObject, line: JQuery, linePosition: LinePositionCache): void {
+        const dragColumn = getDragColumn();
+        if (dragColumn) {
+            // If the drop positions haven't been calculated for this line do so now
+            if (this.dropPositions.length === 0) {
+                this.dropPositions = calculateDropPositions(this.contentType);
+            }
+
+            const columnInstance = dragColumn;
+            const currentX = event.pageX - linePosition.left;
+
+            // Are we within the same column line or have we ended up over another?
+            if (columnInstance.parentContentType === this.contentType && this.startDragEvent) {
+                const dragDirection = (event.pageX <= this.startDragEvent.pageX ? "left" : "right");
+                const adjacentLeftColumn = getAdjacentColumn(dragColumn, "-1");
+
+                // Determine the current move position based on the cursors position and direction of drag
+                this.movePosition = this.dropPositions.find((position) => {
+                    return currentX > position.left && currentX < position.right &&
+                        position.placement === dragDirection && position.affectedColumn !== dragColumn;
+                });
+
+                // Differences in the element & event positions cause a right movement to activate on the left column
+                if (this.movePosition && dragDirection === "right" &&
+                    this.movePosition.affectedColumn === adjacentLeftColumn
+                ) {
+                    this.movePosition = null;
+                }
+
+                if (this.movePosition &&
+                    (!this.isNewLinePlaceDropPlaceholderVisible(event, linePosition)
+                        && !this.isNewLineBottomPlaceDropPlaceholderVisible(event, linePosition))) {
+                    this.dropPlaceholder.removeClass("left right");
+                    this.movePlaceholder.css({
+                        left: (this.movePosition.placement === "left" ? this.movePosition.left : ""),
+                        right: (this.movePosition.placement === "right"
+                            ? linePosition.width - this.movePosition.right : ""),
+                        width: dragColumn.preview.element.outerWidth() + "px",
+                    }).addClass("active");
+                } else {
+                    this.movePlaceholder.removeClass("active");
+                }
+            } else {
+                // If we're moving to another column line we utilise the existing drop placeholder
+                this.movePosition = this.dropPositions.find((position) => {
+                    return currentX > position.left && currentX <= position.right && position.canShrink;
+                });
+
+                if (this.movePosition && !this.isNewLinePlaceDropPlaceholderVisible(event, linePosition)) {
+                    const classToRemove = (this.movePosition.placement === "left" ? "right" : "left");
+                    this.movePlaceholder.removeClass("active");
+                    this.dropPlaceholder.removeClass(classToRemove).css({
+                        left: (this.movePosition.placement === "left" ? this.movePosition.left : ""),
+                        right: (this.movePosition.placement === "right" ?
+                                linePosition.width - this.movePosition.right : ""
+                        ),
+                        width: linePosition.width / this.resizeUtils.getGridSize() + "px",
+                    }).addClass(this.movePosition.placement);
+                } else {
+                    this.dropPlaceholder.removeClass("left right");
+                }
+            }
+        }
+    }
+
+    /**
+     * Handle the resizing on mouse move, we always resize a pair of columns at once
+     *
+     * @param {JQueryEventObject} event
+     * @param {JQuery} group
+     * @param {GroupPositionCache} groupPosition
+     */
+    private onResizingMouseMove(event: JQueryEventObject, group: JQuery, groupPosition: GroupPositionCache): void {
+        let newColumnWidth: ColumnWidth;
+
+        if (this.resizeMouseDown) {
+            event.preventDefault();
+            const currentPos = event.pageX;
+            const resizeColumnLeft = this.resizeColumnInstance.preview.element.offset().left;
+            const resizeColumnWidth = this.resizeColumnInstance.preview.element.outerWidth();
+            const resizeHandlePosition = resizeColumnLeft + resizeColumnWidth;
+            const direction = (currentPos >= resizeHandlePosition) ? "right" : "left";
+
+            let adjustedColumn: ContentTypeCollectionInterface<ColumnPreview>;
+            let modifyColumnInPair: string; // We need to know if we're modifying the left or right column in the pair
+            let usedHistory: string; // Was the adjusted column pulled from history?
+
+            // Determine which column in the group should be adjusted for this action
+            [adjustedColumn, modifyColumnInPair, usedHistory] = this.resizeUtils.determineAdjustedColumn(
+                currentPos,
+                this.resizeColumnInstance,
+                this.resizeHistory,
+            );
+
+            // Calculate the ghost width based on mouse position and bounds of allowed sizes
+            const ghostWidth = this.resizeUtils.calculateGhostWidth(
+                groupPosition,
+                currentPos,
+                this.resizeColumnInstance,
+                modifyColumnInPair,
+                this.resizeMaxGhostWidth,
+            );
+
+            this.resizeGhost.width(ghostWidth - 15 + "px").addClass("active");
+
+            if (adjustedColumn && this.resizeColumnWidths) {
+                newColumnWidth = this.resizeColumnWidths.find((val) => {
+                    return comparator(currentPos, val.position, 35)
+                        && val.forColumn === modifyColumnInPair;
+                });
+
+                if (newColumnWidth) {
+                    let mainColumn = this.resizeColumnInstance;
+                    // If we're using the left data set, we're actually resizing the right column of the group
+                    if (modifyColumnInPair === "right") {
+                        mainColumn = getAdjacentColumn(this.resizeColumnInstance, "+1");
+                    }
+
+                    // Ensure we aren't resizing multiple times, also validate the last resize isn't the same as the
+                    // one being performed now. This occurs as we re-calculate the column positions on resize, we have
+                    // to use the comparator as the calculation may result in slightly different numbers due to rounding
+                    if (this.resizeUtils.getColumnWidth(mainColumn) !== newColumnWidth.width &&
+                        !comparator(this.resizeLastPosition, newColumnWidth.position, 10)
+                    ) {
+                        // If our previous action was to resize the right column in pair, and we're now dragging back
+                        // to the right, but have matched a column for the left we need to fix the columns being
+                        // affected
+                        if (usedHistory && this.resizeLastColumnInPair === "right" && direction === "right" &&
+                            newColumnWidth.forColumn === "left"
+                        ) {
+                            const originalMainColumn = mainColumn;
+                            mainColumn = adjustedColumn;
+                            adjustedColumn = getAdjacentColumn(originalMainColumn, "+1");
+                        }
+
+                        this.recordResizeHistory(
+                            usedHistory,
+                            direction,
+                            adjustedColumn,
+                            modifyColumnInPair,
+                        );
+                        this.resizeLastPosition = newColumnWidth.position;
+
+                        this.resizeLastColumnInPair = modifyColumnInPair;
+
+                        // Ensure the adjusted column is marked as resizing to animate correctly
+                        this.setColumnsAsResizing(mainColumn, adjustedColumn);
+
+                        this.onColumnResize(
+                            mainColumn,
+                            newColumnWidth.width,
+                            adjustedColumn,
+                        );
+
+                        // Wait for the render cycle to finish from the above resize before re-calculating
+                        _.defer(() => {
+                            // If we do a resize, re-calculate the column widths
+                            this.resizeColumnWidths = this.resizeUtils.determineColumnWidths(
+                                this.resizeColumnInstance,
+                                groupPosition,
+                            );
+                            this.resizeMaxGhostWidth = determineMaxGhostWidth(this.resizeColumnWidths);
+                        });
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Unset resizing flag on all child columns
+     */
+    private unsetResizingColumns(): void {
+        this.contentType.children().forEach((column: ContentTypeCollectionInterface<ColumnPreview>) => {
+            column.preview.resizing(false);
+            if (column.preview.element) {
+                column.preview.element.css({transition: ""});
+            }
+        });
+    }
+
+    /**
+     *
+     * @param event
+     * @param linePosition
+     * @private
+     */
+    private isNewLinePlaceDropPlaceholderVisible(event: JQueryEventObject, linePosition: LinePositionCache): boolean {
+
+        const siblings = this.contentType.parentContentType.children();
+        const id = this.contentType.id;
+        let index = 0;
+        siblings.forEach((columnLine) => {
+            if (columnLine.id === id){
+                return false;
+            }
+            index++;
+        });
+        const draggedColumn = getDragColumn();
+        // show column line drop placeholder only for top column line in a group
+
+        return (this.dropOverElement || draggedColumn) &&
+            event.pageY > linePosition.top + 15 &&
+            event.pageY < linePosition.top + 15 + this.lineDropperHeight;
+    }
+
+    /**
+     *
+     * @param event
+     * @param linePosition
+     * @private
+     */
+    private isNewLineBottomPlaceDropPlaceholderVisible(
+        event: JQueryEventObject,
+        linePosition: LinePositionCache,
+    ): boolean {
+
+        const draggedColumn = getDragColumn();
+        return (this.dropOverElement || draggedColumn) &&
+            (event.pageY < linePosition.top + 15 + this.element.outerHeight() &&
+                event.pageY > linePosition.top + 15 + this.element.outerHeight() - this.lineDropperHeight);
+
+    }
+
+    /**
+     *
+     * @param event
+     * @param linePosition
+     * @private
+     */
+    private isNewColumnDropPlaceholderVisible(event: JQueryEventObject, linePosition: LinePositionCache): boolean {
+
+        const draggedColumn = getDragColumn();
+        return (this.dropOverElement || draggedColumn) &&
+        event.pageY > linePosition.top + 15 + this.lineDropperHeight &&
+        event.pageY < linePosition.top + 15 + linePosition.outerHeight - this.lineDropperHeight;
+    }
+    /**
+     * Handle mouse move events on when dropping elements
+     *
+     * @param {JQueryEventObject} event
+     * @param {JQuery} line
+     * @param {LinePositionCache} linePosition
+     */
+    private onDroppingMouseMove(event: JQueryEventObject, line: JQuery, linePosition: LinePositionCache): void {
+        const elementChildrenParent = line.parents(".element-children");
+        // Only initiate this process if we're within the group by a buffer to allow for sortable to function correctly
+        if (this.isNewLinePlaceDropPlaceholderVisible(event, linePosition)) {
+            this.dropPosition = null;
+            this.dropPlaceholder.removeClass("left right");
+            this.columnLineDropPlaceholder.addClass("active");
+            this.columnLineDropPlaceholder.show();
+            return this.handleLineDropMouseMove(event, line, linePosition);
+        } else if (this.isNewLineBottomPlaceDropPlaceholderVisible(event, linePosition)) {
+            this.dropPosition = null;
+            this.dropPlaceholder.removeClass("left right");
+            this.columnLineBottomDropPlaceholder.addClass("active");
+            this.columnLineBottomDropPlaceholder.show();
+            return this.handleLineDropMouseMove(event, line, linePosition);
+        }
+        else if (this.dropOverElement) {
+            this.columnLineDropPlaceholder.hide();
+            this.columnLineBottomDropPlaceholder.hide();
+            this.columnLineBottomDropPlaceholder.removeClass("active");
+            this.columnLineDropPlaceholder.removeClass("active");
+
+        }
+        if (this.isNewColumnDropPlaceholderVisible(event, linePosition)) {
+            this.columnLineDropPlaceholder.hide();
+            this.columnLineDropPlaceholder.removeClass("active");
+            this.columnLineBottomDropPlaceholder.hide();
+            this.columnLineBottomDropPlaceholder.removeClass("active");
+            return this.handleColumnDropMouseMove(event, line, linePosition);
+        }
+    }
+
+    /**
+     *
+     * @param event
+     * @param line
+     * @param linePosition
+     * @private
+     */
+    private handleLineDropMouseMove(event: JQueryEventObject, line: JQuery, linePosition: LinePositionCache): void {
+        const elementChildrenParent = line.parents(".element-children");
+        // Disable the column line sortable instance
+        // Disable the column group sortable instance
+        if (elementChildrenParent.data("ui-sortable")) {
+            elementChildrenParent.sortable("option", "disabled", true);
+        }
+    }
+
+    /**
+     *
+     * @param event
+     * @param line
+     * @param linePosition
+     * @private
+     */
+    private handleColumnDropMouseMove(event: JQueryEventObject, line: JQuery, linePosition: LinePositionCache): void {
+        const elementChildrenParent = line.parents(".element-children");
+        // Only initiate this process if we're within the group by a buffer to allow for sortable to function correctly
+        if (
+            this.dropOverElement &&
+            event.pageY > linePosition.top + 50 &&
+            event.pageY < (linePosition.top + linePosition.outerHeight) - 50
+        ) {
+            // Disable the column line sortable instance
+            if (elementChildrenParent.data("ui-sortable")) {
+                elementChildrenParent.sortable("option", "disabled", true);
+            }
+
+            const currentX = event.pageX - linePosition.left;
+            this.dropPosition = this.dropPositions.find((position) => {
+                return currentX > position.left && currentX <= position.right && position.canShrink;
+            });
+
+            if (this.dropPosition) {
+                this.dropPlaceholder.removeClass("left right").css({
+                    left: (this.dropPosition.placement === "left" ? this.dropPosition.left : ""),
+                    right:
+                        (this.dropPosition.placement === "right" ? linePosition.width - this.dropPosition.right : ""),
+                    width: linePosition.width / this.resizeUtils.getGridSize() + "px",
+                }).addClass(this.dropPosition.placement);
+            }
+        } else if (this.dropOverElement) {
+            // Re-enable the column group sortable instance
+            if (elementChildrenParent.data("ui-sortable")) {
+                elementChildrenParent.sortable("option", "disabled", false);
+            }
+            this.dropPosition = null;
+            this.dropPlaceholder.removeClass("left right");
+        }
+
+    }
+
+    /**
+     * Cache the groups positions
+     *
+     * @param {JQuery} line
+     * @returns {}
+     */
+    private getLinePosition(line: JQuery): LinePositionCache{
+        if (!this.linePositionCache) {
+            this.linePositionCache = {
+                top: line.offset().top,
+                left: line.offset().left,
+                width: line.width(),
+                height: line.height(),
+                outerWidth: line.outerWidth(),
+                outerHeight: line.outerHeight(),
+            };
+        }
+
+        return this.linePositionCache;
+    }
+
+    /**
+     * Init the droppable functionality for new columns
+     *
+     * @param {JQuery} line
+     */
+    private initDroppable(line: JQuery): void {
+        const self = this;
+        let headStyles: HTMLStyleElement;
+
+        line.droppable({
+            deactivate() {
+                self.dropOverElement = null;
+                self.dropPlaceholder.removeClass("left right");
+
+                _.defer(() => {
+                    // Re-enable the column group sortable instance & all children sortable instances
+                    line.parents(".element-children").each(function() {
+                        if ($(this).data("ui-sortable")) {
+                            $(this).sortable("option", "disabled", false);
+                        }
+                    });
+                });
+            },
+            activate() {
+                if (getDraggedContentTypeConfig() === Config.getContentTypeConfig("column-group")) {
+                    line.find(".ui-sortable").each(function() {
+                        if ($(this).data("ui-sortable")) {
+                            $(this).sortable("option", "disabled", true);
+                        }
+                    });
+
+                    const classes = [
+                        ".pagebuilder-content-type.pagebuilder-column .pagebuilder-drop-indicator",
+                        ".pagebuilder-content-type.pagebuilder-column .empty-container .content-type-container:before",
+                    ];
+
+                    // Ensure we don't display any drop indicators inside the column
+                    headStyles = createStyleSheet({
+                        [classes.join(", ")]: {
+                            display: "none!important",
+                        },
+                    });
+                    document.head.appendChild(headStyles);
+                } else if (headStyles) {
+                    headStyles.remove();
+                    headStyles = null;
+                }
+            },
+            drop() {
+                self.dropPositions = [];
+                self.dropPlaceholder.removeClass("left right");
+            },
+            out() {
+                self.dropOverElement = null;
+                self.dropPlaceholder.removeClass("left right");
+            },
+            over() {
+                // Is the element currently being dragged a column group?
+                if (getDraggedContentTypeConfig() === Config.getContentTypeConfig("column-group") ||
+                    getDraggedContentTypeConfig() === Config.getContentTypeConfig("column")) {
+                    // Always calculate drop positions when an element is dragged over
+                    const ownContentType = self.contentType as ContentTypeCollectionInterface<ColumnLinePreview>;
+                    self.dropPositions = calculateDropPositions(ownContentType);
+
+                    self.dropOverElement = true;
+                } else {
+                    self.dropOverElement = null;
+                }
+            },
+        });
+    }
+
+    /**
+     * Spread any empty space across the other columns when a column is removed
+     *
+     * @param {number} removedIndex
+     */
+    private spreadWidth(removedIndex: number): void {
+        if (this.contentType.children().length === 0) {
+            return;
+        }
+
+        const availableWidth = 100 - this.resizeUtils.getColumnsWidth();
+        const formattedAvailableWidth = getRoundedColumnWidth(availableWidth);
+        const totalChildColumns = this.contentType.children().length;
+        const allowedColumnWidths = [];
+        let spreadAcross = 1;
+        let spreadAmount;
+
+        for (let i = this.resizeUtils.getGridSize(); i > 0; i--) {
+            allowedColumnWidths.push(
+                getRoundedColumnWidth(100 / this.resizeUtils.getGridSize() * i),
+            );
+        }
+
+        // Determine how we can spread the empty space across the columns
+        for (let i = totalChildColumns; i > 0; i--) {
+            const potentialWidth = Math.floor(formattedAvailableWidth / i);
+            for (const width of allowedColumnWidths) {
+                if (potentialWidth === Math.floor(width)) {
+                    spreadAcross = i;
+                    spreadAmount = formattedAvailableWidth / i;
+                    break;
+                }
+            }
+            if (spreadAmount) {
+                break;
+            }
+        }
+
+        // Let's spread the width across the columns
+        for (let i = 1; i <= spreadAcross; i++) {
+            let columnToModify: ContentTypeCollectionInterface<ColumnPreview>;
+
+            // As the original column has been removed from the array, check the new index for a column
+            if (removedIndex <= this.contentType.children().length
+                && typeof this.contentType.children()[removedIndex] !== "undefined") {
+                columnToModify = this
+                    .contentType
+                    .children()[removedIndex] as ContentTypeCollectionInterface<ColumnPreview>;
+            }
+            if (!columnToModify && (removedIndex - i) >= 0 &&
+                typeof this.contentType.children()[removedIndex - i] !== "undefined"
+            ) {
+                columnToModify =
+                    this.contentType.children()[removedIndex - i] as ContentTypeCollectionInterface<ColumnPreview>;
+            }
+            if (columnToModify) {
+                updateColumnWidth(
+                    columnToModify,
+                    this.resizeUtils.getColumnWidth(columnToModify) + spreadAmount,
+                );
+            }
+        }
+    }
+
+    /**
+     * Register a resize handle within a child column
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @param {JQuery} handle
+     */
+    private registerResizeHandle(column: ContentTypeCollectionInterface<ColumnPreview>, handle: JQuery) {
+        handle.off("mousedown touchstart");
+        handle.on("mousedown touchstart", (event) => {
+            event.preventDefault();
+            const groupPosition = this.getLinePosition(this.element);
+            this.resizing(true);
+
+            // @ts-ignore
+            this.resizeColumnInstance = column;
+            this.resizeColumnWidths = this.resizeUtils.determineColumnWidths(
+                this.resizeColumnInstance,
+                groupPosition,
+            );
+            this.resizeMaxGhostWidth = determineMaxGhostWidth(this.resizeColumnWidths);
+
+            // Force the cursor to resizing
+            $("body").css("cursor", "col-resize");
+
+            // Reset the resize history
+            this.resizeHistory = {
+                left: [],
+                right: [],
+            };
+
+            this.resizeLastPosition = null;
+            this.resizeMouseDown = true;
+
+            ++this.interactionLevel;
+            events.trigger("stage:interactionStart", {stageId: this.contentType.stageId});
+        });
+    }
+
+    /**
+     * Add Columns to the current Column Line
+     *
+     * @returns {Promise<ContentTypeCollectionInterface>}
+     */
+    private createColumns(): void {
+        const defaultGridSize = getDefaultGridSize();
+        const col1Width = (Math.ceil(defaultGridSize / 2) * 100 / defaultGridSize).toFixed(
+            Math.round(100 / defaultGridSize) !== 100 / defaultGridSize ? 8 : 0,
+        );
+
+        Promise.all([
+            createContentType(
+                Config.getContentTypeConfig("column"),
+                this.contentType,
+                this.contentType.stageId,
+                {width: col1Width + "%"},
+            ),
+            createContentType(
+                Config.getContentTypeConfig("column"),
+                this.contentType,
+                this.contentType.stageId,
+                {width: (100 - parseFloat(col1Width)) + "%"},
+            ),
+        ]).then(
+            (columns: [ContentTypeCollectionInterface<Preview>, ContentTypeCollectionInterface<Preview>]) => {
+                this.contentType.addChild(columns[0], 0);
+                this.contentType.addChild(columns[1], 1);
+                this.fireMountEvent(this.contentType, columns[0], columns[1]);
+            },
+        );
+    }
+
+    /**
+     * Record the resizing history for this action
+     *
+     * @param {string} usedHistory
+     * @param {string} direction
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} adjustedColumn
+     * @param {string} modifyColumnInPair
+     */
+    private recordResizeHistory(
+        usedHistory: string,
+        direction: string,
+        adjustedColumn: ContentTypeCollectionInterface<ColumnPreview>,
+        modifyColumnInPair: string,
+    ): void {
+        if (usedHistory) {
+            this.resizeHistory[usedHistory].pop();
+        }
+        this.resizeHistory[direction].push({
+            adjustedColumn,
+            modifyColumnInPair,
+        });
+    }
+
+    /**
+     * Set columns in the group as resizing
+     *
+     * @param {Array<ContentTypeCollectionInterface<ColumnPreview>>} columns
+     */
+    private setColumnsAsResizing(...columns: Array<ContentTypeCollectionInterface<ColumnPreview>>): void {
+        columns.forEach((column) => {
+            column.preview.resizing(true);
+            column.preview.element.css({transition: `width 350ms ease-in-out`});
+        });
+    }
+
+    /**
+     * Handle a column being resized
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @param {number} width
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} adjustedColumn
+     */
+    private onColumnResize(
+        column: ContentTypeCollectionInterface<ColumnPreview>,
+        width: number,
+        adjustedColumn: ContentTypeCollectionInterface<ColumnPreview>,
+    ) {
+        this.resizeUtils.resizeColumn(column, width, adjustedColumn);
+    }
+
+    /**
+     * Fire the mount event for content types
+     *
+     * @param {ContentTypeInterface[]} contentTypes
+     */
+    private fireMountEvent(...contentTypes: ContentTypeInterface[]) {
+        contentTypes.forEach((contentType) => {
+            events.trigger("contentType:mountAfter", {id: contentType.id, contentType});
+            events.trigger(contentType.config.name + ":mountAfter", {id: contentType.id, contentType});
+        });
+    }
+
+    /**
+     * Remove self if we contain no children
+     */
+    private removeIfEmpty(): void {
+        if (this.contentType.children().length === 0) {
+            this.contentType.parentContentType.removeChild(this.contentType);
+            return;
+        }
+    }
+
+    private getNewColumnLineIndex(): number {
+        let index = -1;
+        const self = this;
+        for (const child of this.contentType.parentContentType.children()) {
+            index++;
+            if (child.id === self.contentType.id) {
+                break;
+            }
+        }
+        if (this.columnLineBottomDropPlaceholder.hasClass("active")) {
+            // show the bottom drop placeholder
+            index++;
+        }
+        return index;
+    }
+
+    private isColumnBeingMovedToAnotherColumnLine(): boolean {
+        const column = getDragColumn();
+        if (!column) {
+            // if no move position, column is not being moved.
+            return false;
+        }
+
+        if (column.parentContentType !== this.contentType) {
+            // if the parent content type is not same as this column line, column is being moved to new column line
+            return true;
+        }
+
+        if (column.parentContentType === this.contentType
+            && (this.columnLineDropPlaceholder.hasClass("active")
+                 || this.columnLineBottomDropPlaceholder.hasClass("active"))) {
+            // since new column line drop placeholder is visible, column move should introduce a new column line
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/column-events.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/column-events.types.ts
index 65bf4429118..37b2a0033c6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/column-events.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/column-events.types.ts
@@ -1,10 +1,11 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
 import ColumnGroupPreview from "../column-group/preview";
+import ColumnLinePreview from "../column-line/preview";
 import ColumnPreview from "./preview";
 
 /**
@@ -14,6 +15,7 @@ export interface BindResizeHandleEventParamsInterface {
     column: ContentTypeCollectionInterface<ColumnPreview>;
     handle: JQuery;
     columnGroup: ContentTypeCollectionInterface<ColumnGroupPreview>;
+    columnLine: ContentTypeCollectionInterface<ColumnLinePreview>;
 }
 
 /**
@@ -23,4 +25,5 @@ export interface InitElementEventParamsInterface {
     column: ContentTypeCollectionInterface<ColumnPreview>;
     element: JQuery;
     columnGroup: ContentTypeCollectionInterface<ColumnGroupPreview>;
+    columnLine: ContentTypeCollectionInterface<ColumnLinePreview>;
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts
index 6ec53813751..b97bc849822 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/converter/style/margins.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/preview.ts
index fe821caa621..6a8e87211cf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
@@ -17,9 +17,10 @@ import {OptionsInterface} from "../../content-type-menu/option.types";
 import ContentTypeInterface from "../../content-type.types";
 import {getDefaultGridSize} from "../column-group/grid-size";
 import ColumnGroupPreview from "../column-group/preview";
+import ColumnLinePreview from "../column-line/preview";
 import {
-    ContentTypeDroppedCreateEventParamsInterface, ContentTypeDuplicateEventParamsInterface,
-    ContentTypeMountEventParamsInterface,
+    ContentTypeDroppedCreateEventParamsInterface,
+    ContentTypeDuplicateEventParamsInterface,
     ContentTypeMoveEventParamsInterface,
     ContentTypeRemovedEventParamsInterface,
 } from "../content-type-events.types";
@@ -94,7 +95,7 @@ export default class Preview extends PreviewCollection {
             this.resetRemoveOnLastColumn(args.sourceParent);
         });
         events.on("column:initializeAfter", (args: InitElementEventParamsInterface) => {
-            this.resetRemoveOnLastColumn(args.columnGroup);
+            this.resetRemoveOnLastColumn(args.columnLine);
         });
         events.on("column:dropAfter", (args: ContentTypeDroppedCreateEventParamsInterface) => {
             this.resetRemoveOnLastColumn(this.contentType.parentContentType);
@@ -121,7 +122,8 @@ export default class Preview extends PreviewCollection {
         events.trigger("column:initializeAfter", {
             column: this.contentType,
             element: $(element),
-            columnGroup: this.contentType.parentContentType,
+            columnLine: this.contentType.parentContentType,
+            columnGroup: this.contentType.parentContentType.parentContentType,
         });
         this.updateDisplayLabel();
     }
@@ -152,7 +154,7 @@ export default class Preview extends PreviewCollection {
         events.trigger("column:resizeHandleBindAfter", {
             column: this.contentType,
             handle: $(handle),
-            columnGroup: this.contentType.parentContentType,
+            columnLine: this.contentType.parentContentType,
         });
     }
 
@@ -224,7 +226,32 @@ export default class Preview extends PreviewCollection {
             return super.clone(contentType, autoAppend);
         }
 
-        // Attempt to split the current column into parts
+        const biggestShrinkableColumn = resizeUtils.findBiggerShrinkableColumn(contentType);
+        if (biggestShrinkableColumn) {
+            const shrinkableClone = super.clone(contentType, autoAppend);
+            if (shrinkableClone) {
+                const newShrinkableColumnWidth = resizeUtils.getColumnWidth(biggestShrinkableColumn)
+                    - resizeUtils.getColumnWidth(contentType);
+                const duplicateColumnWidth = resizeUtils.getColumnWidth(contentType);
+                shrinkableClone.then((duplicateContentType: ContentTypeCollectionInterface<Preview>) => {
+                    updateColumnWidth(
+                        biggestShrinkableColumn,
+                        resizeUtils.getAcceptedColumnWidth(
+                            (newShrinkableColumnWidth).toString(),
+                        ),
+                    );
+                    updateColumnWidth(
+                        duplicateContentType,
+                        duplicateColumnWidth,
+                    );
+
+                    return duplicateContentType;
+                });
+            }
+            return;
+        }
+
+            // Attempt to split the current column into parts
         const splitTimes = Math.round(resizeUtils.getColumnWidth(contentType) / resizeUtils.getSmallestColumnWidth());
         if (splitTimes > 1) {
             const splitClone = super.clone(contentType, autoAppend);
@@ -286,9 +313,11 @@ export default class Preview extends PreviewCollection {
      * Update the display label for the column
      */
     public updateDisplayLabel() {
-        if (this.contentType.parentContentType.preview instanceof ColumnGroupPreview) {
+        if (this.contentType.parentContentType.preview instanceof ColumnLinePreview) {
             const newWidth = parseFloat(this.contentType.dataStore.get("width").toString());
-            const gridSize = (this.contentType.parentContentType.preview as ColumnGroupPreview).gridSize();
+            const grandParent = this.contentType.parentContentType.parentContentType;
+            const columnGroupPreview = (grandParent.preview as ColumnGroupPreview);
+            const gridSize = columnGroupPreview.gridSize();
             const newLabel = `${Math.round(newWidth / (100 / gridSize))}/${gridSize}`;
             const columnIndex = this.contentType.parentContentType.children().indexOf(this.contentType);
             const columnNumber = (columnIndex !== -1) ? `${columnIndex + 1} ` : "";
@@ -305,20 +334,29 @@ export default class Preview extends PreviewCollection {
             // can happen if the column is moved within the same column group
             return;
         }
-        const siblings = parentContentType.children();
-        if (siblings.length < 1) {
+        if (parentContentType.config.name !== "column-line") {
+            // for legacy content in preview mode before stage is initialized, the parent may not be a column line
             return;
         }
-        if (siblings.length === 1) {
-            const lastColumn = siblings[0];
-            const options = lastColumn.preview.getOptions();
-            options.getOption("remove").isDisabled(true);
-            return;
-        }
-        siblings.forEach((column) => {
-            const removeOption = column.preview.getOptions().getOption("remove");
-            removeOption.isDisabled(false);
+        const siblings = parentContentType.children();
+        const siblingColumnLines = parentContentType.parentContentType.children();
+        let totalColumnCount = 0;
+        siblingColumnLines.forEach((columnLine: ContentTypeCollectionInterface) => {
+            const columns = columnLine.children();
+            columns.forEach((column: ContentTypeCollectionInterface) => {
+                totalColumnCount++;
+            });
         });
+
+        const isRemoveDisabled = totalColumnCount <= 1;
+        siblingColumnLines.forEach((columnLine: ContentTypeCollectionInterface) => {
+            const columns = columnLine.children();
+            columns.forEach((column: ContentTypeCollectionInterface) => {
+                const removeOption = column.preview.getOptions().getOption("remove");
+                removeOption.isDisabled(isRemoveDisabled);
+            });
+        });
+
     }
 
     /**
@@ -388,7 +426,7 @@ export default class Preview extends PreviewCollection {
      * Delegate trigger call on children elements.
      */
     private triggerChildren() {
-        if (this.contentType.parentContentType.preview instanceof ColumnGroupPreview) {
+        if (this.contentType.parentContentType.preview instanceof ColumnLinePreview) {
             const newWidth = parseFloat(this.contentType.dataStore.get("width").toString());
 
             this.delegate("trigger", "columnWidthChangeAfter", { width: newWidth });
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/resize.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/resize.ts
index 76bff2589c9..3484bd464eb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/resize.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/column/resize.ts
@@ -1,18 +1,20 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../../content-type-collection.types";
 import {outwardSearch} from "../../utils/array";
 import {ColumnWidth, GroupPositionCache, MaxGhostWidth, ResizeHistory} from "../column-group/preview";
 import ColumnPreview from "./preview";
-
 export default class Resize {
     private columnGroup: ContentTypeCollectionInterface;
+    private columnLine: ContentTypeCollectionInterface;
 
-    constructor(columnGroup: ContentTypeCollectionInterface) {
+    constructor(columnGroup: ContentTypeCollectionInterface,
+                columnLine?: ContentTypeCollectionInterface) {
         this.columnGroup = columnGroup;
+        this.columnLine = columnLine;
     }
 
     /**
@@ -80,13 +82,13 @@ export default class Resize {
     }
 
     /**
-     * Get the total width of all columns in the group
+     * Get the total width of all columns in the column line
      *
      * @returns {number}
      */
     public getColumnsWidth(): number {
         return this.getAcceptedColumnWidth(
-            this.columnGroup.children().map((column: ContentTypeCollectionInterface<ColumnPreview>) => {
+            this.columnLine.children().map((column: ContentTypeCollectionInterface<ColumnPreview>) => {
                 return this.getColumnWidth(column);
             }).reduce((widthA: number, widthB: number) => {
                 return widthA + (widthB ? widthB : 0);
@@ -204,6 +206,24 @@ export default class Resize {
         );
     }
 
+    /**
+     * Find a shrinkable column of a greater size outwards from the current column
+     *
+     * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+     * @returns {ContentTypeCollectionInterface<ColumnPreview>}
+     */
+    public findBiggerShrinkableColumn(
+        column: ContentTypeCollectionInterface<ColumnPreview>,
+    ): ContentTypeCollectionInterface<ColumnPreview> {
+        return outwardSearch(
+            column.parentContentType.children(),
+            getColumnIndexInGroup(column),
+            (neighbourColumn) => {
+                return this.getColumnWidth(neighbourColumn) > this.getColumnWidth(column);
+            },
+        );
+    }
+
     /**
      * Calculate the ghost size for the resizing action
      *
@@ -378,7 +398,7 @@ export default class Resize {
 
 /**
  * Retrieve the index of the column within it's group
- *
+ * @deprecated use getColumnIndexInLine
  * @param {ContentTypeCollectionInterface<ColumnPreview>} column
  * @returns {number}
  */
@@ -386,6 +406,16 @@ export function getColumnIndexInGroup(column: ContentTypeCollectionInterface<Col
     return column.parentContentType.children().indexOf(column);
 }
 
+/**
+ * Retrieve the index of the column within it's column line
+ *
+ * @param {ContentTypeCollectionInterface<ColumnPreview>} column
+ * @returns {number}
+ */
+export function getColumnIndexInLine(column: ContentTypeCollectionInterface<ColumnPreview>): number {
+    return column.parentContentType.children().indexOf(column);
+}
+
 /**
  * Retrieve the adjacent column based on a direction of +1 or -1
  *
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/content-type-events.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/content-type-events.types.ts
index da2692e08b4..83202e66fb7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/content-type-events.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/content-type-events.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../content-type-collection.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/converter-resolver.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/converter-resolver.ts
index 40f0005a176..e4a071f4f1e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/converter-resolver.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/converter-resolver.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataMappingInterface} from "../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/divider/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/divider/preview.ts
index 96ae20231b3..6868e6ad5f8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/divider/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/divider/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import HideShowOption from "../../content-type-menu/hide-show-option";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/heading/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/heading/preview.ts
index a48671f97ae..6d13d82f523 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/heading/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/heading/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/html/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/html/preview.ts
index 96ae20231b3..6868e6ad5f8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/html/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/html/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import HideShowOption from "../../content-type-menu/hide-show-option";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/image/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/image/preview.ts
index 1cc47f8435b..043ce1c4790 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/image/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/image/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {ContentTypeReadyEventParamsInterface} from "Magento_PageBuilder/js/content-type/content-type-events.types";
@@ -59,8 +59,12 @@ export default class Preview extends BasePreview {
     public getViewportImageData() {
         const desktopImageData = this.data.desktop_image;
         const mobileImageData = this.data.mobile_image;
-        return this.viewport() === "mobile" && typeof mobileImageData !== "undefined"
+        const result = this.viewport() === "mobile" && typeof mobileImageData !== "undefined"
             ? mobileImageData : desktopImageData;
+        if (result && result.attributes() && result.attributes().src.length > 0 && result.attributes().src.indexOf("?rand") === -1) {
+            result.attributes().src += "?rand=" + Date.now();
+        }
+        return result;
     }
 
     /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/converter/attribute/locations.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/converter/attribute/locations.ts
index bc5e41f5b5a..954697c9d2a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/converter/attribute/locations.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/converter/attribute/locations.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/preview.ts
index 90b53ad40eb..1f1bf52371b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/map/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-collection.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-collection.ts
index 36d93028331..5c1490b1479 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-collection.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-collection.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import BaseMaster from "./master";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-factory.ts
index e0fda0a20bc..4aade764d7c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../content-type-collection.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master.ts
index 7893df5cb85..813634ef900 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/master.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater-factory.ts
index 9509f224015..c47967e8006 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeConfigInterface from "../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts
index fe58756553e..afefb4d0672 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import consoleLogger from "consoleLogger";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.types.ts
index 1d757d2bdff..9f32d5a6b98 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.types.ts
@@ -3,8 +3,8 @@ import ConverterPool from "../converter/converter-pool";
 import {DataObject} from "../data-store";
 
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 /// <reference types="knockout" />
 
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts
index 3aa2f99e216..6579a8a5b2f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/attributes.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/css.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/css.ts
index 92675ecc44b..266843bed2c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/css.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/css.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import {ContentTypeConfigAppearanceElementInterface} from "../../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/html.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/html.ts
index 625d2ac3bbc..6be575f2816 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/html.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/html.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/style.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/style.ts
index a982eb52b00..88aeb982fc7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/style.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater/style.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.ts
index d021e0c83fb..a3e4cd99e4f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.types.ts
index 4b126553b34..e61beeb937c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-collection.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 import ContentTypeCollectionInterface from "../content-type-collection.types";
 import PreviewCollection from "./preview-collection";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-converter-resolver.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-converter-resolver.ts
index 23e6c4d9452..197f4cce4b7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-converter-resolver.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-converter-resolver.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataMappingStyleInterface} from "../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-factory.ts
index a9397be025f..d23bbe3fdeb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeCollectionInterface from "../content-type-collection.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts
index ab9413e5c4c..2d17126fb3e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.types.ts
index f349ae6446f..63b4b979167 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeConfigInterface from "../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/carousel-widget-directive.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/carousel-widget-directive.ts
index 6be8e995c46..247556cac00 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/carousel-widget-directive.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/carousel-widget-directive.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import {ConverterConfigInterface, ConverterDataInterface} from "../../../mass-converter/converter-interface";
@@ -30,7 +30,9 @@ export default class WidgetDirective extends BaseWidgetDirective {
         data.carousel_products_count = attributes.products_count;
         data.sort_order = attributes.sort_order;
         data.condition_option = attributes.condition_option || "condition";
-        data[data.condition_option] = this.decodeWysiwygCharacters(attributes.condition_option_value || "");
+        data[data.condition_option] = this.decodeWysiwygCharacters(
+            this.decodeHtmlCharacters(attributes.condition_option_value || ""),
+        );
         data.conditions_encoded = this.decodeWysiwygCharacters(attributes.conditions_encoded || "");
         data[data.condition_option + "_source"] = data.conditions_encoded;
         return data;
@@ -98,4 +100,20 @@ export default class WidgetDirective extends BaseWidgetDirective {
             .replace(/&lt;/g, "<")
             .replace(/&gt;/g, ">");
     }
+
+    /**
+     * Decode html special characters
+     *
+     * @param {string} content
+     * @returns {string}
+     */
+    private decodeHtmlCharacters(content: string) {
+        if (content) {
+            const htmlDocument = new DOMParser().parseFromString(content, "text/html");
+
+            return htmlDocument.body ? htmlDocument.body.textContent : content;
+        }
+
+        return content;
+    }
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/widget-directive.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/widget-directive.ts
index e8bd3761017..6bd3ed7437a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/widget-directive.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/widget-directive.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {ConverterConfigInterface, ConverterDataInterface} from "../../../mass-converter/converter-interface";
@@ -30,7 +30,9 @@ export default class WidgetDirective extends BaseWidgetDirective {
         data.products_count = attributes.products_count;
         data.sort_order = attributes.sort_order;
         data.condition_option = attributes.condition_option || "condition";
-        data[data.condition_option] = this.decodeWysiwygCharacters(attributes.condition_option_value || "");
+        data[data.condition_option] = this.decodeWysiwygCharacters(
+            this.decodeHtmlCharacters(attributes.condition_option_value || ""),
+        );
         data.conditions_encoded = this.decodeWysiwygCharacters(attributes.conditions_encoded || "");
         data[data.condition_option + "_source"] = data.conditions_encoded;
         return data;
@@ -98,4 +100,20 @@ export default class WidgetDirective extends BaseWidgetDirective {
             .replace(/&lt;/g, "<")
             .replace(/&gt;/g, ">");
     }
+
+    /**
+     * Decode html special characters
+     *
+     * @param {string} content
+     * @returns {string}
+     */
+    private decodeHtmlCharacters(content: string) {
+        if (content) {
+            const htmlDocument = new DOMParser().parseFromString(content, "text/html");
+
+            return htmlDocument.body ? htmlDocument.body.textContent : content;
+        }
+
+        return content;
+    }
 }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/preview.ts
index f3b7526f68b..6a31a4ee1e7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/root-container/content-type-collection.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/root-container/content-type-collection.ts
index a3bc127f840..99c78c2ca18 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/root-container/content-type-collection.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/root-container/content-type-collection.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import alertDialog from "Magento_Ui/js/modal/alert";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/margins.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/margins.ts
index c2b93a1d718..1d78dd783b5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/margins.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/margins.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/paddings.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/paddings.ts
index 8bc03e6324b..44768730f05 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/paddings.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/converter/style/paddings.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/preview.ts
index 10a8ff162e6..ff6df59cd33 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/row/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import "jarallax";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/attribute/overlay-color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/attribute/overlay-color.ts
index 44e2cbae1d0..a2d5dbb0210 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/attribute/overlay-color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/attribute/overlay-color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-opacity.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-opacity.ts
index e1cd49e8a84..03c59da2b94 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-opacity.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-opacity.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-visibility.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-visibility.ts
index fcedbb1ce69..6fff9572096 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-visibility.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/button-visibility.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/margins.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/margins.ts
index ca46d045582..17d26ada52d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/margins.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/margins.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/overlay-background-color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/overlay-background-color.ts
index 50ddb1f6b92..8c0e563cbc3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/overlay-background-color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/overlay-background-color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/paddings.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/paddings.ts
index 0e836e602fe..86b87946c64 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/paddings.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/converter/style/paddings.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts
index a3a2b019e29..937ad6c7073 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import "jarallax";
@@ -25,6 +25,7 @@ import {
     isWysiwygSupported,
     lockImageSize,
     moveToBookmark,
+    removeReservedHtmlAttributes,
     unlockImageSize,
 } from "../../utils/editor";
 import nestingLinkDialog from "../../utils/nesting-link-dialog";
@@ -488,6 +489,14 @@ export default class Preview extends BasePreview {
      * @inheritDoc
      */
     protected bindEvents() {
+        this.contentType.dataStore.subscribe((state: DataObject) => {
+            const sanitizedContent = removeReservedHtmlAttributes(state.content);
+
+            if (sanitizedContent !== state.content) {
+                state.content = sanitizedContent;
+            }
+        }, "content");
+
         super.bindEvents();
 
         events.on("slide:mountAfter", (args: ContentTypeReadyEventParamsInterface) => {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/component-initializer.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/component-initializer.ts
index 0e1fcc3f409..721aea76bf7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/component-initializer.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/component-initializer.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/config-modifier.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/config-modifier.ts
index 73fb52b0c63..3dce2f66c90 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/config-modifier.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slide/wysiwyg/tinymce/config-modifier.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 import WysiwygConfigInitializerInterface from "../../../../wysiwyg/config-modifier-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slider/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slider/preview.ts
index 03d7fa60b4c..c0b0f1ed614 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slider/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/slider/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/style-registry.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/style-registry.ts
index 52d3b170654..13db2a9a55d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/style-registry.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/style-registry.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tab-item/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tab-item/preview.ts
index 0888e3f98e5..59317c12a04 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tab-item/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tab-item/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/mass-converter/header-alignment.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/mass-converter/header-alignment.ts
index 8e63092fbdb..b6c67376d89 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/mass-converter/header-alignment.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/mass-converter/header-alignment.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import MassConverterInterface, {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts
index fa66373fde5..76d4395dcd2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/tabs/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/preview.ts
index bff35463426..f4d20bbabe4 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/preview.ts
@@ -1,10 +1,11 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
 import events from "Magento_PageBuilder/js/events";
+import {Editor} from "tinymce";
 import _ from "underscore";
 import HideShowOption from "../../content-type-menu/hide-show-option";
 import {OptionsInterface} from "../../content-type-menu/option.types";
@@ -20,6 +21,7 @@ import {
     isWysiwygSupported,
     lockImageSize,
     moveToBookmark,
+    removeReservedHtmlAttributes,
     replaceDoubleQuoteWithSingleQuoteWithinVariableDirective,
     unlockImageSize,
 } from "../../utils/editor";
@@ -155,11 +157,18 @@ export default class Preview extends BasePreview {
 
         const wysiwygConfig = this.config.additional_data.wysiwygConfig.wysiwygConfigData;
 
-        wysiwygConfig.adapter.settings.paste_as_text = true;
-
         if (focus) {
             wysiwygConfig.adapter.settings.auto_focus = this.element.id;
-            wysiwygConfig.adapter.settings.init_instance_callback = () => {
+            wysiwygConfig.adapter.settings.init_instance_callback = (editor: Editor) => {
+                editor.on("mousedown", (event) => {
+                    if (event.target.nodeName === "IMG"
+                        && event.button !== 2
+                        && editor.dom.getRoot() !== document.activeElement
+                    ) {
+                        editor.selection.select(event.target);
+                        editor.nodeChanged();
+                    }
+                });
                 _.defer(() => {
                     this.element.blur();
                     this.element.focus();
@@ -239,6 +248,40 @@ export default class Preview extends BasePreview {
         });
     }
 
+    /**
+     * Handle "mousedown" event
+     *
+     * @param {Preview} preview
+     * @param {JQueryEventObject} event
+     * @returns {Boolean}
+     */
+    public handleMouseDown(preview: Preview, event: JQueryEventObject) {
+        const handleMouseUp = (mouseUpEvent: JQueryEventObject) => {
+            if (this.element
+                && !this.wysiwyg
+                && document.activeElement === this.element
+                // Check that mouseup occurred outside the element, otherwise "click" event will be triggerred in which
+                // case we don't need to do anything as the "click" event is handled in "activateEditor"
+                // Note: click is fired after a full click action occurs; that is, the mouse button is pressed
+                // and released while the pointer remains inside the same element.
+                && this.element !== mouseUpEvent.target
+                && !$.contains(this.element, mouseUpEvent.target)
+            ) {
+                this.activateEditor(this, mouseUpEvent);
+            }
+            $(document).off("mouseup", handleMouseUp);
+            return true;
+        };
+
+        event.stopPropagation();
+
+        if (this.element && !this.wysiwyg) {
+            $(document).on("mouseup",  handleMouseUp);
+        }
+
+        return true;
+    }
+
     /**
      * @param {HTMLTextAreaElement} element
      */
@@ -306,17 +349,19 @@ export default class Preview extends BasePreview {
      * Bind events
      */
     protected bindEvents() {
-        super.bindEvents();
-
         this.contentType.dataStore.subscribe((state: DataObject) => {
-            const sanitizedContent = replaceDoubleQuoteWithSingleQuoteWithinVariableDirective(
-                escapeDoubleQuoteWithinWidgetDirective(state.content),
-            );
+            const sanitizedContent = removeReservedHtmlAttributes(
+                    replaceDoubleQuoteWithSingleQuoteWithinVariableDirective(
+                        escapeDoubleQuoteWithinWidgetDirective(state.content),
+                    ),
+                );
 
             if (sanitizedContent !== state.content) {
                 state.content = sanitizedContent;
             }
-        });
+        }, "content");
+
+        super.bindEvents();
 
         // After drop of new content type open TinyMCE and focus
         events.on("text:dropAfter", (args: ContentTypeMountEventParamsInterface) => {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/component-initializer.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/component-initializer.ts
index 55dd6fcd721..16855cef925 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/component-initializer.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/component-initializer.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/config-modifier.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/config-modifier.ts
index ab98b086e0b..c57b447f637 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/config-modifier.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/text/wysiwyg/tinymce/config-modifier.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 import WysiwygConfigInitializerInterface from "../../../../wysiwyg/config-modifier-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/autoplay.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/autoplay.ts
index 315113e04ea..83bfd19b590 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/autoplay.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/autoplay.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/src.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/src.ts
index d7baba07a24..3e166011829 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/src.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/src.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
@@ -38,12 +38,16 @@ export default class Src implements ConverterInterface {
 
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
             "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+        const youtubeNoCookieRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
+            "(?:youtube-nocookie\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
         const fileRegExp = new RegExp("^(?:https:|http:)?\\/\\/.*[\\\\\\/].+\\.(webm|mp4|ogv)(?!\w)");
 
         if (youtubeRegExp.test(value)) {
             return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1];
+        } else if (youtubeNoCookieRegExp.test(value)) {
+            return "https://www.youtube-nocookie.com/embed/" + youtubeNoCookieRegExp.exec(value)[1];
         } else if (vimeoRegExp.test(value)) {
             return "https://player.vimeo.com/video/" + vimeoRegExp.exec(value)[3] + "?title=0&byline=0&portrait=0";
         } else if (fileRegExp.test(value)) {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/videosrc.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/videosrc.ts
index 27f026a12ec..94aaf740e62 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/videosrc.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/converter/attribute/videosrc.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "../../../../converter/converter-interface";
@@ -8,6 +8,68 @@ import {DataObject} from "../../../../data-store";
 import {get} from "../../../../utils/object";
 
 export default class VideoSrc implements ConverterInterface {
+
+    /**
+     * Parse YouTube parameters from given URL and Autoplay setting from UI
+     *
+     * @param url string
+     * @param data DataObject
+     * @returns string
+     * @private
+     */
+    private static parseYoutubeGetParams(url: string, data: DataObject): string {
+        const acceptableYouTubeParams = [
+            "rel",
+            "controls",
+            "autoplay",
+            "mute",
+            "loop",
+            "playlist",
+            "cc_lang_pref",
+            "cc_load_policy",
+            "color",
+            "disablekb",
+            "end",
+            "fs",
+            "hl",
+            "iv_load_policy",
+            "modestbranding",
+            "start",
+        ];
+
+        const a = document.createElement("a");
+        a.href = url;
+        const urlGetParams: {[key: string]: string} = {};
+        a.search.slice(a.search.indexOf("?") + 1).split("&").map((hash) => {
+            const [key, val] = hash.split("=");
+            urlGetParams[key] = decodeURIComponent(val);
+        });
+
+        const filteredGetParams: {[key: string]: string} = {};
+        for (const param of acceptableYouTubeParams) {
+            if (urlGetParams.hasOwnProperty(param)) {
+                filteredGetParams[param] = urlGetParams[param];
+            }
+        }
+
+        if (data.autoplay === "true") {
+            filteredGetParams.autoplay = "1";
+            filteredGetParams.mute = "1";
+        } else {
+            delete filteredGetParams.autoplay;
+            delete filteredGetParams.mute;
+        }
+
+        const processedGetParams = [];
+        for (const param in filteredGetParams) {
+            if (filteredGetParams.hasOwnProperty(param)) {
+                processedGetParams.push(encodeURI(param + "=" + filteredGetParams[param]));
+            }
+        }
+
+        return processedGetParams.length > 0 ? "?" + processedGetParams.join("&") : "";
+    }
+
     /**
      * Convert value to internal format
      *
@@ -16,6 +78,7 @@ export default class VideoSrc implements ConverterInterface {
      */
     public fromDom(value: string): string | object {
         value = value.replace(/\?autoplay=1&mute=1/g, "");
+        value = value.replace(/&autoplay=1&mute=1/g, "");
         value = value.replace(/\?title=0&byline=0&portrait=0/g, "");
         value = value.replace(/&autoplay=1&autopause=0&muted=1/g, "");
         return value;
@@ -36,12 +99,17 @@ export default class VideoSrc implements ConverterInterface {
 
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
             "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+        const youtubeNoCookieRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
+            "(?:youtube-nocookie\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
 
         if (youtubeRegExp.test(value)) {
             return "https://www.youtube.com/embed/" + youtubeRegExp.exec(value)[1] +
-                (data.autoplay === "true" ? "?autoplay=1&mute=1" : "");
+                VideoSrc.parseYoutubeGetParams(value, data);
+        } else if (youtubeNoCookieRegExp.test(value)) {
+            return "https://www.youtube-nocookie.com/embed/" + youtubeNoCookieRegExp.exec(value)[1] +
+                VideoSrc.parseYoutubeGetParams(value, data);
         } else if (vimeoRegExp.test(value)) {
             return "https://player.vimeo.com/video/" + vimeoRegExp.exec(value)[3] +
                 "?title=0&byline=0&portrait=0" + (data.autoplay === "true" ? "&autoplay=1&autopause=0&muted=1" : "");
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/master.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/master.ts
index 5ae5d46cd94..b91eccfebde 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/master.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/master.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import BaseMaster from "../master";
@@ -9,7 +9,8 @@ export default class Master extends BaseMaster {
 
     public isHosted(src: string): boolean {
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
-            "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+            "(?:youtu\\.be\/|(?:youtube\\.com\/|youtube-nocookie\\.com\/)(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))" +
+            "([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
         return (vimeoRegExp.test(src) || youtubeRegExp.test(src));
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/preview.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/preview.ts
index ec93d4764c4..fa5b0c8e42f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/preview.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/video/preview.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import HideShowOption from "../../content-type-menu/hide-show-option";
@@ -34,7 +34,8 @@ export default class Preview extends BasePreview {
 
     public isHosted(src: string): boolean {
         const youtubeRegExp = new RegExp("^(?:https?:\/\/|\/\/)?(?:www\\.|m\\.)?" +
-            "(?:youtu\\.be\/|youtube\\.com\/(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))([\\w-]{11})(?![\\w-])");
+            "(?:youtu\\.be\/|(?:youtube\\.com\/|youtube-nocookie\\.com\/)(?:embed\/|v\/|watch\\?v=|watch\\?.+&v=))" +
+            "([\\w-]{11})(?![\\w-])");
         const vimeoRegExp = new RegExp("https?:\/\/(?:www\\.|player\\.)?vimeo.com\/(?:channels\/" +
             "(?:\\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\\d+)\/video\/|video\/|)(\\d+)(?:$|\/|\\?)");
         return (vimeoRegExp.test(src) || youtubeRegExp.test(src));
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-href.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-href.ts
index 42a875cb7e9..e212e7b6371 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-href.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-href.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-target.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-target.ts
index 92376c0808d..a9617f9699f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-target.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-target.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-type.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-type.ts
index dc9a000c563..041fcc4ef4a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-type.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/link-type.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/src.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/src.ts
index c1b917a60f3..750e342ba98 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/src.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/src.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/store-id.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/store-id.ts
index 2adc7252de0..af282016263 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/store-id.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/preview/store-id.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/src.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/src.ts
index d38984620c0..607126d80e0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/src.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/src.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/video-overlay-color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/video-overlay-color.ts
index 473f5a391c3..5d2b9887a45 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/video-overlay-color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/attribute/video-overlay-color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-interface.ts
index d13430af9b9..7021626343c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool-factory.ts
index c6bba56c354..0be42c8c7ec 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool.ts
index a24acaa4204..6e35808b72a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/converter-pool.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "./converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/decode.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/decode.ts
index 919786ae265..2248aecfadb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/decode.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/decode.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/directive.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/directive.ts
index 8651fe9fb98..f99dbdbbcb9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/directive.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/directive.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/tag-escaper.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/tag-escaper.ts
index c35c66c17df..214a26528e2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/tag-escaper.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/html/tag-escaper.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {escape, unescape} from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/background-image.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/background-image.ts
index 00b105c80d8..602dcd53e94 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/background-image.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/background-image.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-style.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-style.ts
index 319a565b680..44d4cd1e529 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-style.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-style.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-width.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-width.ts
index c70dcdc5f23..d84db6e0270 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-width.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/border-width.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/color.ts
index 87c025aaf95..6853d347de4 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/display.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/display.ts
index 5755a6ae8d5..aab580d3dee 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/display.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/display.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/margins.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/margins.ts
index 6e5b4104149..1c1bd7e306d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/margins.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/margins.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts
index 04ba6cdb604..8e16bee6c6e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/overlay-border-radius.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/overlay-border-radius.ts
index 76c3d999efd..913d0e954c2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/overlay-border-radius.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/overlay-border-radius.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/paddings.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/paddings.ts
index fd5aa7f5a24..24db16fe50c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/paddings.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/paddings.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/background-image.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/background-image.ts
index bc17af7be77..976675efe61 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/background-image.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/background-image.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/display.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/display.ts
index b1312ca4a8a..9b362ac0024 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/display.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/preview/display.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/remove-px.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/remove-px.ts
index f03012890d1..a6ba79bddf9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/remove-px.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/remove-px.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/video-overlay-color.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/video-overlay-color.ts
index a489452df4f..26cba5139f2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/video-overlay-color.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/video-overlay-color.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts
index 607d81e6850..9e053a26afc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/width.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import {DataObject} from "../../data-store";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/data-store.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/data-store.ts
index a07c8503618..a7a770dbdca 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/data-store.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/data-store.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/drop-indicators.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/drop-indicators.ts
index d4be74f3e75..c9a2d80ddb4 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/drop-indicators.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/drop-indicators.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 import {createStyleSheet} from "../utils/create-stylesheet";
 import {getContainersFor} from "./matrix";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/matrix.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/matrix.ts
index 10737c54062..a0cbdbb3296 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/matrix.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/matrix.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 import _ from "underscore";
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/move-content-type.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/move-content-type.ts
index 3223daf0da1..ec88aae8ec2 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/move-content-type.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/move-content-type.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 import ko from "knockout";
 import events from "Magento_PageBuilder/js/events";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/registry.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/registry.ts
index 60fd7e12680..abca0d90818 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/registry.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/registry.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ContentTypeConfigInterface from "../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/sortable.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/sortable.ts
index 6839f7e699c..e20296b492e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/sortable.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/drag-drop/sortable.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-images.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-images.ts
index 58234bed87e..bd520d0c39d 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-images.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-images.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-type.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-type.ts
index 7696564147d..acaa161582b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-type.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/background-type.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import {get, set} from "../utils/object";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-interface.ts
index f7593704471..fd10c76c19a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool-factory.ts
index 29773baff20..cad7671ca23 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool.ts
index 287b9ba646e..06b9e959980 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/converter-pool.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ConverterInterface from "./converter-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/empty-mobile-image.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/empty-mobile-image.ts
index 9717fd4b655..2ae68148b9b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/empty-mobile-image.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/empty-mobile-image.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import ImageArrayObject from "../converter/image-array-object.types";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/widget-directive-abstract.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/widget-directive-abstract.ts
index 146169817f4..09f8cae7b99 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/widget-directive-abstract.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/mass-converter/widget-directive-abstract.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import _ from "underscore";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/filter-html.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/filter-html.ts
index 5a379a9c101..4c8ab2f3495 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/filter-html.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/filter-html.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read-interface.ts
index c00264d5de6..661ee70acb5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts
index fbfe71ef25c..931c968049a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render.ts
index 186aff5162f..83624452190 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/events.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/events.ts
index 0904b5d308e..140ae9771ff 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/events.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/events.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/frame.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/frame.ts
index a9f90671e9f..edfe21d410c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/frame.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/frame.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import csso from "csso";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/requirejs/text.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/requirejs/text.ts
index f8a00c81345..f9e16c69458 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/requirejs/text.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/requirejs/text.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import text from "mage/requirejs/text";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/serialize.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/serialize.ts
index 946085ad4a2..1f7a616edc8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/serialize.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/render/serialize.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/validator.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/validator.ts
index c328b41e920..71e513b12a3 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/validator.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/validator.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts
index 0f204c48aeb..443da92dac9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.types.ts
index 72ce759598c..a19519c404c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/page-builder.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import Panel from "./panel";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts
index 47576bdc799..a4e474b6a66 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import consoleLogger from "consoleLogger";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu.ts
index 99d7a844f3a..8586edc9af7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu/content-type.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu/content-type.ts
index ff2d7098f6f..937c5370b18 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu/content-type.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/panel/menu/content-type.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import ko from "knockout";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/attribute-reader.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/attribute-reader.ts
index f256835d199..52d9402ce92 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/attribute-reader.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/attribute-reader.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import PropertyReaderInterface from "./property-reader-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/margins.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/margins.ts
index 9f536face60..08e0241934b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/margins.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/margins.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import PropertyReaderInterface from "./property-reader-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/paddings.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/paddings.ts
index 7346f3a4f02..b531c22f73c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/paddings.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/paddings.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import PropertyReaderInterface from "./property-reader-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-interface.ts
index 793a95bd43a..c60a99d36fd 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool-factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool-factory.ts
index 736aeddfa57..6d3f86c5e91 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool-factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool-factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool.ts
index 633e8ef2352..88bbcc7c0a6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/property-reader-pool.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import PropertyReaderInterface from "./property-reader-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/style-property-reader.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/style-property-reader.ts
index a8b46237624..10ea4d924d6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/style-property-reader.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/property/style-property-reader.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {fromSnakeToCamelCase} from "../utils/string";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts
index 01c61e09ba5..669d1b5bedd 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $t from "mage/translate";
@@ -245,14 +245,14 @@ function createInitialElementData(fields: ConfigFieldInterface): FieldDefaultsIn
  */
 function getElementChildren(element: HTMLElement): HTMLElement[] {
     if (element.hasChildNodes()) {
-        let children: any[] = [];
+        const children: any[] = [];
         // Find direct children of the element
         _.forEach(element.childNodes, (child: HTMLElement) => {
             if (child.nodeType === Node.ELEMENT_NODE) {
                 if (child.hasAttribute(Config.getConfig("dataContentTypeAttributeName"))) {
                     children.push(child);
                 } else {
-                    children = getElementChildren(child);
+                    children.push(...getElementChildren(child));
                 }
             }
         });
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-events.types.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-events.types.ts
index ab20bbb4ca5..30bdcf2d7a6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-events.types.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-events.types.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage.ts
index 2ddc9b89802..d507a1bb30f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/template-manager.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/template-manager.ts
index 3981e97bf65..5100e5919d6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/template-manager.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/template-manager.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import html2canvas from "html2canvas";
@@ -138,6 +138,7 @@ function createCapture(stage: Stage) {
     renderingLock.then(() => {
         // Resolve issues with Parallax
         const parallaxRestore = disableParallax(stageElement);
+        const canvasElement = document.querySelector("#" + stage.id + " .pagebuilder-canvas") as HTMLElement;
 
         stageElement.style.height = $(stageElement).outerHeight(false) + "px";
         stageElement.classList.add("capture");
@@ -151,11 +152,12 @@ function createCapture(stage: Stage) {
 
         _.defer(() => {
             html2canvas(
-                document.querySelector("#" + stage.id + " .pagebuilder-canvas"),
+                canvasElement,
                 {
                     scale: 1,
                     useCORS: true,
                     scrollY: (window.pageYOffset * -1),
+                    height: correctCanvasHeight(canvasElement),
                 },
             ).then((canvas: HTMLCanvasElement) => {
                 const imageSrc = canvas.toDataURL("image/jpeg", 0.85);
@@ -216,6 +218,16 @@ function restoreParallax(rows: ResetRowInterface[]) {
     });
 }
 
+/**
+ * Adjust canvas element size to prevent area overflow.
+ *
+ * @param canvasElement
+ */
+function correctCanvasHeight(canvasElement: HTMLElement) {
+    // @ts-ignore
+    return canvasElement.getHeight() < 4096 ? canvasElement.getHeight() : 4096;
+}
+
 interface ResetRowInterface {
     element: HTMLElement;
     styles: string;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/alert.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/alert.d.ts
index 0cc5e79f083..788444a040f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/alert.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/alert.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 interface AlertConfigInterface {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dismissible-confirm.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dismissible-confirm.d.ts
index e4562c1dd84..8ef6e8f9353 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dismissible-confirm.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dismissible-confirm.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 interface DismissibleConfirmInterface {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dom-observer.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dom-observer.d.ts
index dff0483574e..d975d89b48e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dom-observer.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/dom-observer.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare var DomObserver: {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/events.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/events.d.ts
index cb9596fa39c..ef8df5f40cb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/events.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/events.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare module "Magento_PageBuilder/js/events" {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/jarallax.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/jarallax.d.ts
index cceeb440355..95119503afb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/jarallax.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/jarallax.d.ts
@@ -6,7 +6,8 @@
 /// <reference types="jquery"/>
 
 /**
- * Scroll calculations used by onScroll event
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 interface JarallaxOnScrollCalculations {
     rect: object;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/key-codes.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/key-codes.d.ts
index 460b90a9ac8..4fcbf721f1c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/key-codes.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/key-codes.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare module "Magento_Ui/js/lib/key-codes" {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template-engine.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template-engine.d.ts
index 207dc8e632c..e40eda6c46a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template-engine.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template-engine.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare let koTemplateEngine: {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template.loader.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template.loader.d.ts
index 50227c90216..26ca0eb7588 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template.loader.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/knockout-template.loader.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare let loader: {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/mageUtils.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/mageUtils.d.ts
index 81e9acc8768..9a696078ee6 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/mageUtils.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/mageUtils.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 interface CompareObject {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/resize-observer.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/resize-observer.d.ts
index 08275aac958..de5a9e6bfeb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/resize-observer.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/resize-observer.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 interface DOMRectReadOnly {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/text.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/text.d.ts
index 2d96e703544..fb6ea6dc96f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/text.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/text.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare let text: {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/tools.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/tools.d.ts
index 2daa1cc6c49..326eddaceb0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/tools.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/tools.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 interface Base64 {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/ui-layout.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/ui-layout.d.ts
index 268e10d7793..f242cf73112 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/ui-layout.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/ui-layout.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/utils-map.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/utils-map.d.ts
index f1b697cc918..481302e1a95 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/utils-map.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/utils-map.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 interface MapUtilityInterface {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/widget-intializer.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/widget-intializer.d.ts
index c58d15b4c64..87006acbcfc 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/widget-intializer.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/widget-intializer.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 interface WidgetIntializerConfigInterface {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg-events.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg-events.d.ts
index 0c6e6a4ca7e..14610e7886f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg-events.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg-events.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare var WysiwygEvents: {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg.d.ts
index 23407a08e02..4227cdd465e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/types/wysiwyg.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 interface EventBusInterface {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/uploader.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/uploader.ts
index 8c63a596ccb..e8f6c58fa26 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/uploader.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/uploader.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import events from "Magento_PageBuilder/js/events";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/array.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/array.ts
index fd657c691f3..f65f4330112 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/array.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/array.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/check-stage-full-screen.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/check-stage-full-screen.ts
index 16e320fa354..053a89bed0e 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/check-stage-full-screen.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/check-stage-full-screen.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/create-stylesheet.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/create-stylesheet.ts
index 0bc439ddfaf..261525045b5 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/create-stylesheet.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/create-stylesheet.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {StyleBlock, StyleBlocks} from "./style-blocks";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/delay-until.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/delay-until.ts
index d8a48518d6a..a9cd3726e64 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/delay-until.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/delay-until.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/directives.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/directives.ts
index 9faa61ab1d3..6553148dbc9 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/directives.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/directives.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/editor.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/editor.ts
index 2efc194587a..f18f155237a 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/editor.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/editor.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
@@ -279,7 +279,8 @@ export function createBookmark(event: JQueryEventObject): Bookmark {
  * @param bookmark
  */
 export function moveToBookmark(bookmark: Bookmark) {
-    ((window as any).tinymce.activeEditor as Editor).selection.moveToBookmark(bookmark);
+    getActiveEditor().selection.moveToBookmark(bookmark);
+    getActiveEditor().nodeChanged();
 }
 
 /**
@@ -469,6 +470,40 @@ export function replaceDoubleQuoteWithSingleQuoteWithinVariableDirective(content
     );
 }
 
+/**
+ * Remove Page Builder reserved html tag attributes from the content
+ *
+ * @param {string} content
+ * @returns {string}
+ */
+export function removeReservedHtmlAttributes(content: string): string
+{
+    const attributes: {[key: string]: string} = Config.getConfig("stage_config").reserved_html_attributes || {};
+    for (const attribute of Object.keys(attributes)) {
+        content = removeHtmlTagAttribute(content, attribute);
+    }
+    return content;
+}
+
+/**
+ * Remove attribute from html tags
+ *
+ * @param {string} content
+ * @param {string} name
+ * @returns {string}
+ */
+function removeHtmlTagAttribute(content: string, name: string): string
+{
+    if (typeof content === "string" && content.indexOf(`${name}=`) !== -1) {
+        const html = new DOMParser().parseFromString(content, "text/html");
+        html.querySelectorAll(`[${name}]`).forEach((child: Element) => {
+            child.removeAttribute(name);
+        });
+        content = html.body.innerHTML;
+    }
+    return content;
+}
+
 interface IdBookmark {
     id: string;
     keep?: boolean;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/image.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/image.ts
index 84a17844e02..aa34f5951b0 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/image.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/image.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import Config from "../config";
@@ -17,7 +17,7 @@ import {convertUrlToPathIfOtherUrlIsOnlyAPath} from "./url";
 export function decodeUrl(value: string): string | [object] {
     let result: any = "";
     value = decodeURIComponent((value).replace(window.location.href, ""));
-    const regexp = /{{.*\s*url="?(.*\.([a-z|A-Z]*))"?\s*}}/;
+    const regexp = /{{.*\s*url="?(.*\.([a-z|A-Z|0-9?=]*))\"?\s*}}/;
     if (regexp.test(value)) {
         const [, url, type] = regexp.exec(value);
         const image = {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/loader.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/loader.ts
index 8485a463766..a7fcdf6f0bb 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/loader.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/loader.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 export default function load(
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-link-dialog.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-link-dialog.ts
index 9ffa05efc9b..95fec199fd7 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-link-dialog.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-link-dialog.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-widget-dialog.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-widget-dialog.ts
index b415e1f81b2..14b19156eca 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-widget-dialog.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/nesting-widget-dialog.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/object.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/object.ts
index bf26f4fc8a8..bd68e4868f8 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/object.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/object.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 import objectPath from "object-path";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/pagebuilder-header-height.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/pagebuilder-header-height.ts
index 5c5c4418093..c171acb019f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/pagebuilder-header-height.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/pagebuilder-header-height.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/position-sticky.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/position-sticky.ts
index 29f6282d540..eb181ca1cdf 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/position-sticky.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/position-sticky.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/promise-deferred.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/promise-deferred.ts
index 4e98c65e1d6..19d67a33653 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/promise-deferred.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/promise-deferred.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/string.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/string.ts
index 246974bf5dc..202d9d57c28 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/string.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/string.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/style-blocks.d.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/style-blocks.d.ts
index 33335e6e9e7..da53f8ac187 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/style-blocks.d.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/style-blocks.d.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/url.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/url.ts
index 4ccb79a15d2..020e7c7d91f 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/url.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/utils/url.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/component-initializer-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/component-initializer-interface.ts
index 66518ee8f56..f91cf51736c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/component-initializer-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/component-initializer-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import WysiwygInterface from "./wysiwyg-interface";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/config-modifier-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/config-modifier-interface.ts
index b3d282416ee..c39f745cd06 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/config-modifier-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/config-modifier-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 export interface WysiwygConfigModifierInterface {
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/factory.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/factory.ts
index e1e426567ee..4531350891b 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/factory.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/factory.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/tinymce.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/tinymce.ts
index 479e2eeb7c3..9dc68672223 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/tinymce.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/tinymce.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 import $ from "jquery";
@@ -180,7 +180,7 @@ export default class Wysiwyg implements WysiwygInterface {
         // Wait for everything else to finish
         _.defer(() => delayUntil(
             () => {
-                const $inlineToolbar = this.getFixedToolbarContainer().find(".tox-tinymce-inline");
+                const $inlineToolbar = this.getFixedToolbarContainer().find(".tox-hugerte-inline");
                 const self = this;
 
                 $inlineToolbar.css("min-width", this.config.adapter_config.minToolbarWidth + "px");
@@ -202,7 +202,7 @@ export default class Wysiwyg implements WysiwygInterface {
                     });
                     this.resizeObserver.observe($inlineToolbar.get(0));
                 }
-                const dialogContainer = document.querySelector(`#${this.elementId} ~ .tox-tinymce-aux`);
+                const dialogContainer = document.querySelector(`#${this.elementId} ~ .tox-hugerte-aux`);
                 if (!!dialogContainer) {
                     dialogContainer.setAttribute("data-editor-aux", this.elementId);
                     document.body.appendChild(dialogContainer);
@@ -227,11 +227,11 @@ export default class Wysiwyg implements WysiwygInterface {
     private onBlur() {
         this.getFixedToolbarContainer()
             .removeClass("pagebuilder-toolbar-active")
-            .find(".tox-tinymce-inline")
+            .find(".tox-hugerte-inline")
             .css("top", "");
 
         if (this.resizeObserver) {
-            this.resizeObserver.unobserve(this.getFixedToolbarContainer().find(".tox-tinymce-inline").get(0));
+            this.resizeObserver.unobserve(this.getFixedToolbarContainer().find(".tox-hugerte-inline").get(0));
         }
         this.toolbarHeight = 0;
 
@@ -271,7 +271,7 @@ export default class Wysiwyg implements WysiwygInterface {
             return;
         }
 
-        const $inlineToolbar = this.getFixedToolbarContainer().find(".tox-tinymce-inline");
+        const $inlineToolbar = this.getFixedToolbarContainer().find(".tox-hugerte-inline");
 
         if (!$inlineToolbar.length) {
             return;
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/wysiwyg-interface.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/wysiwyg-interface.ts
index b6972b81e52..e96441e3d5c 100644
--- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/wysiwyg-interface.ts
+++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/wysiwyg/wysiwyg-interface.ts
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 import {AdditionalDataConfigInterface} from "../content-type-config.types";
diff --git a/app/code/Magento/PageBuilder/view/base/requirejs-config.js b/app/code/Magento/PageBuilder/view/base/requirejs-config.js
index 45ce17ffd3a..93fe31ed356 100644
--- a/app/code/Magento/PageBuilder/view/base/requirejs-config.js
+++ b/app/code/Magento/PageBuilder/view/base/requirejs-config.js
@@ -10,7 +10,8 @@ var config = {
             'jarallax': 'Magento_PageBuilder/js/resource/jarallax/jarallax',
             'jarallaxVideo': 'Magento_PageBuilder/js/resource/jarallax/jarallax-video',
             'Magento_PageBuilder/js/resource/vimeo/player': 'vimeo/player',
-            'Magento_PageBuilder/js/resource/vimeo/vimeo-wrapper': 'vimeo/vimeo-wrapper'
+            'Magento_PageBuilder/js/resource/vimeo/vimeo-wrapper': 'vimeo/vimeo-wrapper',
+            'jarallax-wrapper': 'Magento_PageBuilder/js/resource/jarallax/jarallax-wrapper'
         }
     },
     shim: {
@@ -18,7 +19,7 @@ var config = {
             deps: ['jquery']
         },
         'Magento_PageBuilder/js/resource/jarallax/jarallax-video': {
-            deps: ['jarallax', 'vimeoWrapper']
+            deps: ['jarallax-wrapper', 'vimeoWrapper']
         }
     }
 };
diff --git a/app/code/Magento/PageBuilder/view/base/templates/googlemaps.phtml b/app/code/Magento/PageBuilder/view/base/templates/googlemaps.phtml
index 44eddc51fea..773a517cfc5 100644
--- a/app/code/Magento/PageBuilder/view/base/templates/googlemaps.phtml
+++ b/app/code/Magento/PageBuilder/view/base/templates/googlemaps.phtml
@@ -1,36 +1,47 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
-/** @var Magento\PageBuilder\Block\GoogleMapsApi $block */
-?>
-<script>
+/**
+ * @var Magento\PageBuilder\Block\GoogleMapsApi $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
+
+$libraryUrl = $escaper->escapeJs($block->getLibraryUrl());
+$style = $escaper->escapeJs($block->getStyle());
+$apiKey = $escaper->escapeJs($block->getApiKey());
+$invalidApiKeyMessage = $escaper->escapeJs($block->getInvalidApiKeyMessage());
+
+$script = <<<SCRIPT
     require.config({
         paths: {
-            googleMaps: '<?= $block->escapeJs($block->getLibraryUrl()); ?>'
+            googleMaps: '{$libraryUrl}'
         },
         config: {
             'Magento_PageBuilder/js/utils/map': {
-                style: '<?= $block->escapeJs($block->getStyle()); ?>'
+                style: '{$style}',
             },
             'Magento_PageBuilder/js/content-type/map/preview': {
-                apiKey: '<?= $block->escapeJs($block->getApiKey()); ?>',
-                apiKeyErrorMessage: '<?= $block->escapeJs($block->getInvalidApiKeyMessage()); ?>'
+                apiKey: '{$apiKey}',
+                apiKeyErrorMessage: '{$invalidApiKeyMessage}'
             },
             'Magento_PageBuilder/js/form/element/map': {
-                apiKey: '<?= $block->escapeJs($block->getApiKey()); ?>',
-                apiKeyErrorMessage: '<?= $block->escapeJs($block->getInvalidApiKeyMessage()); ?>'
+                apiKey: '{$apiKey}',
+                apiKeyErrorMessage: '{$invalidApiKeyMessage}'
             },
         }
     });
-</script>
+SCRIPT;
+// phpcs:ignore
+echo /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false);
+
+/** Include the googleMaps dependency only if we have an API key set, this removes unnecessary calls to Google */
+if ($block->shouldIncludeGoogleMapsLibrary()) {
+    $script = <<<SCRIPT
 
-<?php
-// Include the googleMaps dependency only if we have an API key set, this removes unnecessary calls to Google
-if ($block->shouldIncludeGoogleMapsLibrary()) : ?>
-<script>
     require.config({
         shim: {
             'Magento_PageBuilder/js/utils/map': {
@@ -38,5 +49,8 @@ if ($block->shouldIncludeGoogleMapsLibrary()) : ?>
             }
         }
     });
-</script>
-<?php endif; ?>
+SCRIPT;
+
+    // phpcs:ignore
+    echo /* @noEscape */ $secureRenderer->renderTag('script', [], $script, false);
+}
diff --git a/app/code/Magento/PageBuilder/view/base/web/css/source/_module.less b/app/code/Magento/PageBuilder/view/base/web/css/source/_module.less
index 3a0942cd0bb..62810c27f2a 100644
--- a/app/code/Magento/PageBuilder/view/base/web/css/source/_module.less
+++ b/app/code/Magento/PageBuilder/view/base/web/css/source/_module.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 @import 'hljs/hljs.less';
 @import 'jarallax/jarallax.less';
diff --git a/app/code/Magento/PageBuilder/view/base/web/css/source/hljs/hljs.less b/app/code/Magento/PageBuilder/view/base/web/css/source/hljs/hljs.less
index 6333796e45e..d2b82a219c8 100644
--- a/app/code/Magento/PageBuilder/view/base/web/css/source/hljs/hljs.less
+++ b/app/code/Magento/PageBuilder/view/base/web/css/source/hljs/hljs.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 @darker-gray: #282a36;
 @light-blue: #8be9fd;
diff --git a/app/code/Magento/PageBuilder/view/base/web/css/source/jarallax/_jarallax.less b/app/code/Magento/PageBuilder/view/base/web/css/source/jarallax/_jarallax.less
index 9fe3216c95d..2d91f7d8c9c 100644
--- a/app/code/Magento/PageBuilder/view/base/web/css/source/jarallax/_jarallax.less
+++ b/app/code/Magento/PageBuilder/view/base/web/css/source/jarallax/_jarallax.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2020 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Jarallax styles
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/content-type/products/appearance/carousel/widget.js b/app/code/Magento/PageBuilder/view/base/web/js/content-type/products/appearance/carousel/widget.js
index 9d6a4a36fe3..382325f9cbb 100644
--- a/app/code/Magento/PageBuilder/view/base/web/js/content-type/products/appearance/carousel/widget.js
+++ b/app/code/Magento/PageBuilder/view/base/web/js/content-type/products/appearance/carousel/widget.js
@@ -27,7 +27,7 @@ define([
             $carouselElement.slick('unslick');
         }
 
-        config.slidesToScroll = config.slidesToShow;
+        config.slidesToScroll = Math.floor(config.slidesToShow);
         $carouselElement.slick(config);
     }
 
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.js
index a1486ad4537..d8a5ee83f8f 100644
--- a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.js
+++ b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.js
@@ -1,327 +1,158 @@
 /*!
- * Name    : Video Background Extension for Jarallax
- * Version : 1.0.1
- * Author  : nK <https://nkdev.info>
- * GitHub  : https://github.com/nk-o/jarallax
+ * Video Extension for Jarallax v2.0.3 (https://github.com/nk-o/jarallax)
+ * Copyright 2022 nK <https://nkdev.info>
+ * Licensed under MIT (https://github.com/nk-o/jarallax/blob/master/LICENSE)
  */
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 6);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */,
-/* 1 */,
-/* 2 */
-/***/ (function(module, exports) {
-
-module.exports = function (callback) {
-  if (document.readyState === 'complete' || document.readyState === 'interactive') {
-    // Already ready or interactive, execute callback
-    callback.call();
-  } else if (document.attachEvent) {
-    // Old browsers
-    document.attachEvent('onreadystatechange', function () {
-      if (document.readyState === 'interactive') callback.call();
-    });
-  } else if (document.addEventListener) {
-    // Modern browsers
-    document.addEventListener('DOMContentLoaded', callback);
-  }
-};
-
-/***/ }),
-/* 3 */,
-/* 4 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(global) {var win;
-
-if (typeof window !== "undefined") {
-  win = window;
-} else if (typeof global !== "undefined") {
-  win = global;
-} else if (typeof self !== "undefined") {
-  win = self;
-} else {
-  win = {};
-}
-
-module.exports = win;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(5)))
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-var g; // This works in non-strict mode
-
-g = function () {
-  return this;
-}();
-
-try {
-  // This works if eval is allowed (see CSP)
-  g = g || new Function("return this")();
-} catch (e) {
-  // This works if the window reference is available
-  if ((typeof window === "undefined" ? "undefined" : _typeof(window)) === "object") g = window;
-} // g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
-
-
-module.exports = g;
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(7);
-
-
-/***/ }),
-/* 7 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var video_worker__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var video_worker__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(video_worker__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(global__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var lite_ready__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2);
-/* harmony import */ var lite_ready__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lite_ready__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _jarallax_video_esm__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(10);
-
 
-
- // add video worker globally to fallback jarallax < 1.10 versions
-
-global__WEBPACK_IMPORTED_MODULE_1___default.a.VideoWorker = global__WEBPACK_IMPORTED_MODULE_1___default.a.VideoWorker || video_worker__WEBPACK_IMPORTED_MODULE_0___default.a;
-Object(_jarallax_video_esm__WEBPACK_IMPORTED_MODULE_3__["default"])(); // data-jarallax-video initialization
-
-lite_ready__WEBPACK_IMPORTED_MODULE_2___default()(function () {
-  if (typeof jarallax !== 'undefined') {
-    jarallax(document.querySelectorAll('[data-jarallax-video]'));
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+      typeof define === 'function' && define.amd ? define(factory) :
+          (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.jarallaxVideo = factory());
+})(this, (function () { 'use strict';
+
+  /*!
+   * Name    : Video Worker
+   * Version : 2.0.0
+   * Author  : nK <https://nkdev.info>
+   * GitHub  : https://github.com/nk-o/video-worker
+   */
+
+  /* eslint-disable import/no-mutable-exports */
+
+  /* eslint-disable no-restricted-globals */
+  let win$1;
+
+  if (typeof window !== 'undefined') {
+    win$1 = window;
+  } else if (typeof global !== 'undefined') {
+    win$1 = global;
+  } else if (typeof self !== 'undefined') {
+    win$1 = self;
+  } else {
+    win$1 = {};
   }
-});
 
-/***/ }),
-/* 8 */
-/***/ (function(module, exports, __webpack_require__) {
+  var global$1$1 = win$1; // Deferred
+  // thanks http://stackoverflow.com/questions/18096715/implement-deferred-object-without-using-jquery
 
-module.exports = __webpack_require__(9);
-
-/***/ }),
-/* 9 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  function Deferred() {
+    this.doneCallbacks = [];
+    this.failCallbacks = [];
+  }
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return VideoWorker; });
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+  Deferred.prototype = {
+    execute(list, args) {
+      let i = list.length; // eslint-disable-next-line no-param-reassign
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+      args = Array.prototype.slice.call(args);
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+      while (i) {
+        i -= 1;
+        list[i].apply(null, args);
+      }
+    },
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+    resolve(...args) {
+      this.execute(this.doneCallbacks, args);
+    },
 
-// Deferred
-// thanks http://stackoverflow.com/questions/18096715/implement-deferred-object-without-using-jquery
-function Deferred() {
-  this._done = [];
-  this._fail = [];
-}
+    reject(...args) {
+      this.execute(this.failCallbacks, args);
+    },
 
-Deferred.prototype = {
-  execute: function execute(list, args) {
-    var i = list.length;
-    args = Array.prototype.slice.call(args);
+    done(callback) {
+      this.doneCallbacks.push(callback);
+    },
 
-    while (i--) {
-      list[i].apply(null, args);
+    fail(callback) {
+      this.failCallbacks.push(callback);
     }
-  },
-  resolve: function resolve() {
-    this.execute(this._done, arguments);
-  },
-  reject: function reject() {
-    this.execute(this._fail, arguments);
-  },
-  done: function done(callback) {
-    this._done.push(callback);
-  },
-  fail: function fail(callback) {
-    this._fail.push(callback);
-  }
-};
-var ID = 0;
-var YoutubeAPIadded = 0;
-var VimeoAPIadded = 0;
-var loadingYoutubePlayer = 0;
-var loadingVimeoPlayer = 0;
-var loadingYoutubeDefer = new Deferred();
-var loadingVimeoDefer = new Deferred();
-
-var VideoWorker =
-/*#__PURE__*/
-function () {
-  function VideoWorker(url, options) {
-    _classCallCheck(this, VideoWorker);
-
-    var self = this;
-    self.url = url;
-    self.options_default = {
-      autoplay: false,
-      loop: false,
-      mute: false,
-      volume: 100,
-      showContols: true,
-      // start / end video time in seconds
-      startTime: 0,
-      endTime: 0
-    };
-    self.options = self.extend({}, self.options_default, options); // check URL
-
-    self.videoID = self.parseURL(url); // init
 
-    if (self.videoID) {
-      self.ID = ID++;
-      self.loadAPI();
-      self.init();
-    }
-  } // Extend like jQuery.extend
+  };
+  let ID = 0;
+  let YoutubeAPIadded = 0;
+  let VimeoAPIadded = 0;
+  let loadingYoutubePlayer = 0;
+  let loadingVimeoPlayer = 0;
+  const loadingYoutubeDefer = /*#__PURE__*/new Deferred();
+  const loadingVimeoDefer = /*#__PURE__*/new Deferred();
+
+  class VideoWorker {
+    constructor(url, options) {
+      const self = this;
+      self.url = url;
+      self.options_default = {
+        autoplay: false,
+        loop: false,
+        mute: false,
+        volume: 100,
+        showControls: true,
+        accessibilityHidden: false,
+        // start / end video time in seconds
+        startTime: 0,
+        endTime: 0
+      };
+      self.options = self.extend({}, self.options_default, options); // Fix wrong option name.
+      // Thanks to https://github.com/nk-o/video-worker/issues/13.
+
+      if (typeof self.options.showContols !== 'undefined') {
+        self.options.showControls = self.options.showContols;
+        delete self.options.showContols;
+      } // check URL
+
+
+      self.videoID = self.parseURL(url); // init
+
+      if (self.videoID) {
+        self.ID = ID;
+        ID += 1;
+        self.loadAPI();
+        self.init();
+      }
+    } // Extend like jQuery.extend
+    // eslint-disable-next-line class-methods-use-this
 
 
-  _createClass(VideoWorker, [{
-    key: "extend",
-    value: function extend(out) {
-      var _arguments = arguments;
-      out = out || {};
-      Object.keys(arguments).forEach(function (i) {
-        if (!_arguments[i]) {
+    extend(...args) {
+      const out = args[0] || {};
+      Object.keys(args).forEach(i => {
+        if (!args[i]) {
           return;
         }
 
-        Object.keys(_arguments[i]).forEach(function (key) {
-          out[key] = _arguments[i][key];
+        Object.keys(args[i]).forEach(key => {
+          out[key] = args[i][key];
         });
       });
       return out;
     }
-  }, {
-    key: "parseURL",
-    value: function parseURL(url) {
+
+    parseURL(url) {
       // parse youtube ID
       function getYoutubeID(ytUrl) {
         // eslint-disable-next-line no-useless-escape
-        var regExp = /.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=)([^#\&\?]*).*/;
-        var match = ytUrl.match(regExp);
+        const regExp = /.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=)([^#\&\?]*).*/;
+        const match = ytUrl.match(regExp);
         return match && match[1].length === 11 ? match[1] : false;
       } // parse vimeo ID
 
 
       function getVimeoID(vmUrl) {
         // eslint-disable-next-line no-useless-escape
-        var regExp = /https?:\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:$|\/|\?)/;
-        var match = vmUrl.match(regExp);
+        const regExp = /https?:\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:$|\/|\?)/;
+        const match = vmUrl.match(regExp);
         return match && match[3] ? match[3] : false;
       } // parse local string
 
 
       function getLocalVideos(locUrl) {
         // eslint-disable-next-line no-useless-escape
-        var videoFormats = locUrl.split(/,(?=mp4\:|webm\:|ogv\:|ogg\:)/);
-        var result = {};
-        var ready = 0;
-        videoFormats.forEach(function (val) {
+        const videoFormats = locUrl.split(/,(?=mp4\:|webm\:|ogv\:|ogg\:)/);
+        const result = {};
+        let ready = 0;
+        videoFormats.forEach(val => {
           // eslint-disable-next-line no-useless-escape
-          var match = val.match(/^(mp4|webm|ogv|ogg)\:(.*)/);
+          const match = val.match(/^(mp4|webm|ogv|ogg)\:(.*)/);
 
           if (match && match[1] && match[2]) {
             // eslint-disable-next-line prefer-destructuring
@@ -332,41 +163,40 @@ function () {
         return ready ? result : false;
       }
 
-      var Youtube = getYoutubeID(url);
-      var Vimeo = getVimeoID(url);
-      var Local = getLocalVideos(url);
+      const Youtube = getYoutubeID(url);
+      const Vimeo = getVimeoID(url);
+      const Local = getLocalVideos(url);
 
       if (Youtube) {
         this.type = 'youtube';
         return Youtube;
-      } else if (Vimeo) {
+      }
+
+      if (Vimeo) {
         this.type = 'vimeo';
         return Vimeo;
-      } else if (Local) {
+      }
+
+      if (Local) {
         this.type = 'local';
         return Local;
       }
 
       return false;
     }
-  }, {
-    key: "isValid",
-    value: function isValid() {
+
+    isValid() {
       return !!this.videoID;
     } // events
 
-  }, {
-    key: "on",
-    value: function on(name, callback) {
+
+    on(name, callback) {
       this.userEventsList = this.userEventsList || []; // add new callback in events list
 
       (this.userEventsList[name] || (this.userEventsList[name] = [])).push(callback);
     }
-  }, {
-    key: "off",
-    value: function off(name, callback) {
-      var _this = this;
 
+    off(name, callback) {
       if (!this.userEventsList || !this.userEventsList[name]) {
         return;
       }
@@ -374,33 +204,27 @@ function () {
       if (!callback) {
         delete this.userEventsList[name];
       } else {
-        this.userEventsList[name].forEach(function (val, key) {
+        this.userEventsList[name].forEach((val, key) => {
           if (val === callback) {
-            _this.userEventsList[name][key] = false;
+            this.userEventsList[name][key] = false;
           }
         });
       }
     }
-  }, {
-    key: "fire",
-    value: function fire(name) {
-      var _this2 = this;
-
-      var args = [].slice.call(arguments, 1);
 
+    fire(name, ...args) {
       if (this.userEventsList && typeof this.userEventsList[name] !== 'undefined') {
-        this.userEventsList[name].forEach(function (val) {
+        this.userEventsList[name].forEach(val => {
           // call with all arguments
           if (val) {
-            val.apply(_this2, args);
+            val.apply(this, args);
           }
         });
       }
     }
-  }, {
-    key: "play",
-    value: function play(start) {
-      var self = this;
+
+    play(start) {
+      const self = this;
 
       if (!self.player) {
         return;
@@ -411,7 +235,7 @@ function () {
           self.player.seekTo(start || 0);
         }
 
-        if (YT.PlayerState.PLAYING !== self.player.getPlayerState()) {
+        if (global$1$1.YT.PlayerState.PLAYING !== self.player.getPlayerState()) {
           self.player.playVideo();
         }
       }
@@ -421,7 +245,7 @@ function () {
           self.player.setCurrentTime(start);
         }
 
-        self.player.getPaused().then(function (paused) {
+        self.player.getPaused().then(paused => {
           if (paused) {
             self.player.play();
           }
@@ -438,23 +262,22 @@ function () {
         }
       }
     }
-  }, {
-    key: "pause",
-    value: function pause() {
-      var self = this;
+
+    pause() {
+      const self = this;
 
       if (!self.player) {
         return;
       }
 
       if (self.type === 'youtube' && self.player.pauseVideo) {
-        if (YT.PlayerState.PLAYING === self.player.getPlayerState()) {
+        if (global$1$1.YT.PlayerState.PLAYING === self.player.getPlayerState()) {
           self.player.pauseVideo();
         }
       }
 
       if (self.type === 'vimeo') {
-        self.player.getPaused().then(function (paused) {
+        self.player.getPaused().then(paused => {
           if (!paused) {
             self.player.pause();
           }
@@ -467,10 +290,9 @@ function () {
         }
       }
     }
-  }, {
-    key: "mute",
-    value: function mute() {
-      var self = this;
+
+    mute() {
+      const self = this;
 
       if (!self.player) {
         return;
@@ -488,10 +310,9 @@ function () {
         self.$video.muted = true;
       }
     }
-  }, {
-    key: "unmute",
-    value: function unmute() {
-      var self = this;
+
+    unmute() {
+      const self = this;
 
       if (!self.player) {
         return;
@@ -509,11 +330,9 @@ function () {
         self.$video.muted = false;
       }
     }
-  }, {
-    key: "setVolume",
-    value: function setVolume() {
-      var volume = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-      var self = this;
+
+    setVolume(volume = false) {
+      const self = this;
 
       if (!self.player || !volume) {
         return;
@@ -531,10 +350,9 @@ function () {
         self.$video.volume = volume / 100;
       }
     }
-  }, {
-    key: "getVolume",
-    value: function getVolume(callback) {
-      var self = this;
+
+    getVolume(callback) {
+      const self = this;
 
       if (!self.player) {
         callback(false);
@@ -546,7 +364,7 @@ function () {
       }
 
       if (self.type === 'vimeo' && self.player.getVolume) {
-        self.player.getVolume().then(function (volume) {
+        self.player.getVolume().then(volume => {
           callback(volume);
         });
       }
@@ -555,10 +373,9 @@ function () {
         callback(self.$video.volume * 100);
       }
     }
-  }, {
-    key: "getMuted",
-    value: function getMuted(callback) {
-      var self = this;
+
+    getMuted(callback) {
+      const self = this;
 
       if (!self.player) {
         callback(null);
@@ -570,7 +387,7 @@ function () {
       }
 
       if (self.type === 'vimeo' && self.player.getVolume) {
-        self.player.getVolume().then(function (volume) {
+        self.player.getVolume().then(volume => {
           callback(!!volume);
         });
       }
@@ -579,10 +396,9 @@ function () {
         callback(self.$video.muted);
       }
     }
-  }, {
-    key: "getImageURL",
-    value: function getImageURL(callback) {
-      var self = this;
+
+    getImageURL(callback) {
+      const self = this;
 
       if (self.videoImage) {
         callback(self.videoImage);
@@ -590,38 +406,41 @@ function () {
       }
 
       if (self.type === 'youtube') {
-        var availableSizes = ['maxresdefault', 'sddefault', 'hqdefault', '0'];
-        var step = 0;
-        var tempImg = new Image();
+        const availableSizes = ['maxresdefault', 'sddefault', 'hqdefault', '0'];
+        let step = 0;
+        const tempImg = new Image();
 
         tempImg.onload = function () {
           // if no thumbnail, youtube add their own image with width = 120px
           if ((this.naturalWidth || this.width) !== 120 || step === availableSizes.length - 1) {
             // ok
-            self.videoImage = "https://img.youtube.com/vi/".concat(self.videoID, "/").concat(availableSizes[step], ".jpg");
+            self.videoImage = `https://img.youtube.com/vi/${self.videoID}/${availableSizes[step]}.jpg`;
             callback(self.videoImage);
           } else {
             // try another size
-            step++;
-            this.src = "https://img.youtube.com/vi/".concat(self.videoID, "/").concat(availableSizes[step], ".jpg");
+            step += 1;
+            this.src = `https://img.youtube.com/vi/${self.videoID}/${availableSizes[step]}.jpg`;
           }
         };
 
-        tempImg.src = "https://img.youtube.com/vi/".concat(self.videoID, "/").concat(availableSizes[step], ".jpg");
+        tempImg.src = `https://img.youtube.com/vi/${self.videoID}/${availableSizes[step]}.jpg`;
       }
 
       if (self.type === 'vimeo') {
-        var request = new XMLHttpRequest();
-        request.open('GET', "https://vimeo.com/api/v2/video/".concat(self.videoID, ".json"), true);
+        let request = new XMLHttpRequest(); // https://vimeo.com/api/oembed.json?url=https://vimeo.com/235212527
+
+        request.open('GET', `https://vimeo.com/api/oembed.json?url=${self.url}`, true);
 
         request.onreadystatechange = function () {
           if (this.readyState === 4) {
             if (this.status >= 200 && this.status < 400) {
               // Success!
-              var response = JSON.parse(this.responseText);
-              self.videoImage = response[0].thumbnail_large;
-              callback(self.videoImage);
-            } else {// Error :(
+              const response = JSON.parse(this.responseText);
+
+              if (response.thumbnail_url) {
+                self.videoImage = response.thumbnail_url;
+                callback(self.videoImage);
+              }
             }
           }
         };
@@ -631,15 +450,13 @@ function () {
       }
     } // fallback to the old version.
 
-  }, {
-    key: "getIframe",
-    value: function getIframe(callback) {
+
+    getIframe(callback) {
       this.getVideo(callback);
     }
-  }, {
-    key: "getVideo",
-    value: function getVideo(callback) {
-      var self = this; // return generated video block
+
+    getVideo(callback) {
+      const self = this; // return generated video block
 
       if (self.$video) {
         callback(self.$video);
@@ -647,8 +464,8 @@ function () {
       } // generate new video block
 
 
-      self.onAPIready(function () {
-        var hiddenDiv;
+      self.onAPIready(() => {
+        let hiddenDiv;
 
         if (!self.$video) {
           hiddenDiv = document.createElement('div');
@@ -657,17 +474,20 @@ function () {
 
 
         if (self.type === 'youtube') {
-          self.playerOptions = {};
-          self.playerOptions.videoId = self.videoID;
-          self.playerOptions.playerVars = {
-            autohide: 1,
-            rel: 0,
-            autoplay: 0,
-            // autoplay enable on mobile devices
-            playsinline: 1
+          self.playerOptions = {
+            // GDPR Compliance.
+            host: 'https://www.youtube-nocookie.com',
+            videoId: self.videoID,
+            playerVars: {
+              autohide: 1,
+              rel: 0,
+              autoplay: 0,
+              // autoplay enable on mobile devices
+              playsinline: 1
+            }
           }; // hide controls
 
-          if (!self.options.showContols) {
+          if (!self.options.showControls) {
             self.playerOptions.playerVars.iv_load_policy = 3;
             self.playerOptions.playerVars.modestbranding = 1;
             self.playerOptions.playerVars.controls = 0;
@@ -676,10 +496,10 @@ function () {
           } // events
 
 
-          var ytStarted;
-          var ytProgressInterval;
+          let ytStarted;
+          let ytProgressInterval;
           self.playerOptions.events = {
-            onReady: function onReady(e) {
+            onReady(e) {
               // mute
               if (self.options.mute) {
                 e.target.mute();
@@ -696,13 +516,13 @@ function () {
               // https://github.com/nk-o/video-worker/issues/2
 
               if (self.options.loop && !self.options.endTime) {
-                var secondsOffset = 0.1;
+                const secondsOffset = 0.1;
                 self.options.endTime = self.player.getDuration() - secondsOffset;
               } // volumechange
 
 
-              setInterval(function () {
-                self.getVolume(function (volume) {
+              setInterval(() => {
+                self.getVolume(volume => {
                   if (self.options.volume !== volume) {
                     self.options.volume = volume;
                     self.fire('volumechange', e);
@@ -710,32 +530,33 @@ function () {
                 });
               }, 150);
             },
-            onStateChange: function onStateChange(e) {
+
+            onStateChange(e) {
               // loop
-              if (self.options.loop && e.data === YT.PlayerState.ENDED) {
+              if (self.options.loop && e.data === global$1$1.YT.PlayerState.ENDED) {
                 self.play(self.options.startTime);
               }
 
-              if (!ytStarted && e.data === YT.PlayerState.PLAYING) {
+              if (!ytStarted && e.data === global$1$1.YT.PlayerState.PLAYING) {
                 ytStarted = 1;
                 self.fire('started', e);
               }
 
-              if (e.data === YT.PlayerState.PLAYING) {
+              if (e.data === global$1$1.YT.PlayerState.PLAYING) {
                 self.fire('play', e);
               }
 
-              if (e.data === YT.PlayerState.PAUSED) {
+              if (e.data === global$1$1.YT.PlayerState.PAUSED) {
                 self.fire('pause', e);
               }
 
-              if (e.data === YT.PlayerState.ENDED) {
+              if (e.data === global$1$1.YT.PlayerState.ENDED) {
                 self.fire('ended', e);
               } // progress check
 
 
-              if (e.data === YT.PlayerState.PLAYING) {
-                ytProgressInterval = setInterval(function () {
+              if (e.data === global$1$1.YT.PlayerState.PLAYING) {
+                ytProgressInterval = setInterval(() => {
                   self.fire('timeupdate', e); // check for end of video and play again or stop
 
                   if (self.options.endTime && self.player.getCurrentTime() >= self.options.endTime) {
@@ -749,21 +570,32 @@ function () {
               } else {
                 clearInterval(ytProgressInterval);
               }
+            },
+
+            onError(e) {
+              self.fire('error', e);
             }
+
           };
-          var firstInit = !self.$video;
+          const firstInit = !self.$video;
 
           if (firstInit) {
-            var div = document.createElement('div');
+            const div = document.createElement('div');
             div.setAttribute('id', self.playerID);
             hiddenDiv.appendChild(div);
             document.body.appendChild(hiddenDiv);
           }
 
-          self.player = self.player || new window.YT.Player(self.playerID, self.playerOptions);
+          self.player = self.player || new global$1$1.YT.Player(self.playerID, self.playerOptions);
 
           if (firstInit) {
-            self.$video = document.getElementById(self.playerID); // get video width and height
+            self.$video = document.getElementById(self.playerID); // add accessibility attributes
+
+            if (self.options.accessibilityHidden) {
+              self.$video.setAttribute('tabindex', '-1');
+              self.$video.setAttribute('aria-hidden', 'true');
+            } // get video width and height
+
 
             self.videoWidth = parseInt(self.$video.getAttribute('width'), 10) || 1280;
             self.videoHeight = parseInt(self.$video.getAttribute('height'), 10) || 720;
@@ -773,6 +605,8 @@ function () {
 
         if (self.type === 'vimeo') {
           self.playerOptions = {
+            // GDPR Compliance.
+            dnt: 1,
             id: self.videoID,
             autopause: 0,
             transparent: 0,
@@ -786,7 +620,7 @@ function () {
           } // hide controls
 
 
-          if (!self.options.showContols) {
+          if (!self.options.showControls) {
             self.playerOptions.badge = 0;
             self.playerOptions.byline = 0;
             self.playerOptions.portrait = 0;
@@ -795,42 +629,49 @@ function () {
           }
 
           if (!self.$video) {
-            var playerOptionsString = '';
-            Object.keys(self.playerOptions).forEach(function (key) {
+            let playerOptionsString = '';
+            Object.keys(self.playerOptions).forEach(key => {
               if (playerOptionsString !== '') {
                 playerOptionsString += '&';
               }
 
-              playerOptionsString += "".concat(key, "=").concat(encodeURIComponent(self.playerOptions[key]));
+              playerOptionsString += `${key}=${encodeURIComponent(self.playerOptions[key])}`;
             }); // we need to create iframe manually because when we create it using API
             // js events won't triggers after iframe moved to another place
 
             self.$video = document.createElement('iframe');
             self.$video.setAttribute('id', self.playerID);
-            self.$video.setAttribute('src', "https://player.vimeo.com/video/".concat(self.videoID, "?").concat(playerOptionsString));
+            self.$video.setAttribute('src', `https://player.vimeo.com/video/${self.videoID}?${playerOptionsString}`);
             self.$video.setAttribute('frameborder', '0');
             self.$video.setAttribute('mozallowfullscreen', '');
             self.$video.setAttribute('allowfullscreen', '');
+            self.$video.setAttribute('title', 'Vimeo video player'); // add accessibility attributes
+
+            if (self.options.accessibilityHidden) {
+              self.$video.setAttribute('tabindex', '-1');
+              self.$video.setAttribute('aria-hidden', 'true');
+            }
+
             hiddenDiv.appendChild(self.$video);
             document.body.appendChild(hiddenDiv);
           }
 
-          self.player = self.player || new Vimeo.Player(self.$video, self.playerOptions); // set current time for autoplay
+          self.player = self.player || new global$1$1.Vimeo.Player(self.$video, self.playerOptions); // set current time for autoplay
 
           if (self.options.startTime && self.options.autoplay) {
             self.player.setCurrentTime(self.options.startTime);
           } // get video width and height
 
 
-          self.player.getVideoWidth().then(function (width) {
+          self.player.getVideoWidth().then(width => {
             self.videoWidth = width || 1280;
           });
-          self.player.getVideoHeight().then(function (height) {
+          self.player.getVideoHeight().then(height => {
             self.videoHeight = height || 720;
           }); // events
 
-          var vmStarted;
-          self.player.on('timeupdate', function (e) {
+          let vmStarted;
+          self.player.on('timeupdate', e => {
             if (!vmStarted) {
               self.fire('started', e);
               vmStarted = 1;
@@ -848,30 +689,33 @@ function () {
               }
             }
           });
-          self.player.on('play', function (e) {
+          self.player.on('play', e => {
             self.fire('play', e); // check for the start time and start with it
 
             if (self.options.startTime && e.seconds === 0) {
               self.play(self.options.startTime);
             }
           });
-          self.player.on('pause', function (e) {
+          self.player.on('pause', e => {
             self.fire('pause', e);
           });
-          self.player.on('ended', function (e) {
+          self.player.on('ended', e => {
             self.fire('ended', e);
           });
-          self.player.on('loaded', function (e) {
+          self.player.on('loaded', e => {
             self.fire('ready', e);
           });
-          self.player.on('volumechange', function (e) {
+          self.player.on('volumechange', e => {
             self.fire('volumechange', e);
           });
+          self.player.on('error', e => {
+            self.fire('error', e);
+          });
         } // Local
 
 
         function addSourceToLocal(element, src, type) {
-          var source = document.createElement('source');
+          const source = document.createElement('source');
           source.src = src;
           source.type = type;
           element.appendChild(source);
@@ -881,7 +725,7 @@ function () {
           if (!self.$video) {
             self.$video = document.createElement('video'); // show controls
 
-            if (self.options.showContols) {
+            if (self.options.showControls) {
               self.$video.controls = true;
             } // mute
 
@@ -899,18 +743,24 @@ function () {
 
 
             self.$video.setAttribute('playsinline', '');
-            self.$video.setAttribute('webkit-playsinline', '');
+            self.$video.setAttribute('webkit-playsinline', ''); // add accessibility attributes
+
+            if (self.options.accessibilityHidden) {
+              self.$video.setAttribute('tabindex', '-1');
+              self.$video.setAttribute('aria-hidden', 'true');
+            }
+
             self.$video.setAttribute('id', self.playerID);
             hiddenDiv.appendChild(self.$video);
             document.body.appendChild(hiddenDiv);
-            Object.keys(self.videoID).forEach(function (key) {
-              addSourceToLocal(self.$video, self.videoID[key], "video/".concat(key));
+            Object.keys(self.videoID).forEach(key => {
+              addSourceToLocal(self.$video, self.videoID[key], `video/${key}`);
             });
           }
 
           self.player = self.player || self.$video;
-          var locStarted;
-          self.player.addEventListener('playing', function (e) {
+          let locStarted;
+          self.player.addEventListener('playing', e => {
             if (!locStarted) {
               self.fire('started', e);
             }
@@ -930,13 +780,13 @@ function () {
               }
             }
           });
-          self.player.addEventListener('play', function (e) {
+          self.player.addEventListener('play', e => {
             self.fire('play', e);
           });
-          self.player.addEventListener('pause', function (e) {
+          self.player.addEventListener('pause', e => {
             self.fire('pause', e);
           });
-          self.player.addEventListener('ended', function (e) {
+          self.player.addEventListener('ended', e => {
             self.fire('ended', e);
           });
           self.player.addEventListener('loadedmetadata', function () {
@@ -949,33 +799,34 @@ function () {
               self.play(self.options.startTime);
             }
           });
-          self.player.addEventListener('volumechange', function (e) {
-            self.getVolume(function (volume) {
+          self.player.addEventListener('volumechange', e => {
+            self.getVolume(volume => {
               self.options.volume = volume;
             });
             self.fire('volumechange', e);
           });
+          self.player.addEventListener('error', e => {
+            self.fire('error', e);
+          });
         }
 
         callback(self.$video);
       });
     }
-  }, {
-    key: "init",
-    value: function init() {
-      var self = this;
-      self.playerID = "VideoWorker-".concat(self.ID);
+
+    init() {
+      const self = this;
+      self.playerID = `VideoWorker-${self.ID}`;
     }
-  }, {
-    key: "loadAPI",
-    value: function loadAPI() {
-      var self = this;
+
+    loadAPI() {
+      const self = this;
 
       if (YoutubeAPIadded && VimeoAPIadded) {
         return;
       }
 
-      var src = ''; // load Youtube API
+      let src = ''; // load Youtube API
 
       if (self.type === 'youtube' && !YoutubeAPIadded) {
         YoutubeAPIadded = 1;
@@ -986,7 +837,7 @@ function () {
       if (self.type === 'vimeo' && !VimeoAPIadded) {
         VimeoAPIadded = 1; // Useful when Vimeo API added using RequireJS https://github.com/nk-o/video-worker/pull/7
 
-        if (typeof Vimeo !== 'undefined') {
+        if (typeof global$1$1.Vimeo !== 'undefined') {
           return;
         }
 
@@ -998,33 +849,32 @@ function () {
       } // add script in head section
 
 
-      var tag = document.createElement('script');
-      var head = document.getElementsByTagName('head')[0];
+      let tag = document.createElement('script');
+      let head = document.getElementsByTagName('head')[0];
       tag.src = src;
       head.appendChild(tag);
       head = null;
       tag = null;
     }
-  }, {
-    key: "onAPIready",
-    value: function onAPIready(callback) {
-      var self = this; // Youtube
+
+    onAPIready(callback) {
+      const self = this; // Youtube
 
       if (self.type === 'youtube') {
         // Listen for global YT player callback
-        if ((typeof YT === 'undefined' || YT.loaded === 0) && !loadingYoutubePlayer) {
+        if ((typeof global$1$1.YT === 'undefined' || global$1$1.YT.loaded === 0) && !loadingYoutubePlayer) {
           // Prevents Ready event from being called twice
           loadingYoutubePlayer = 1; // Creates deferred so, other players know when to wait.
 
-          window.onYouTubeIframeAPIReady = function () {
-            window.onYouTubeIframeAPIReady = null;
+          global$1$1.onYouTubeIframeAPIReady = function () {
+            global$1$1.onYouTubeIframeAPIReady = null;
             loadingYoutubeDefer.resolve('done');
             callback();
           };
-        } else if ((typeof YT === "undefined" ? "undefined" : _typeof(YT)) === 'object' && YT.loaded === 1) {
+        } else if (typeof global$1$1.YT === 'object' && global$1$1.YT.loaded === 1) {
           callback();
         } else {
-          loadingYoutubeDefer.done(function () {
+          loadingYoutubeDefer.done(() => {
             callback();
           });
         }
@@ -1032,19 +882,19 @@ function () {
 
 
       if (self.type === 'vimeo') {
-        if (typeof Vimeo === 'undefined' && !loadingVimeoPlayer) {
+        if (typeof global$1$1.Vimeo === 'undefined' && !loadingVimeoPlayer) {
           loadingVimeoPlayer = 1;
-          var vimeoInterval = setInterval(function () {
-            if (typeof Vimeo !== 'undefined') {
+          const vimeoInterval = setInterval(() => {
+            if (typeof global$1$1.Vimeo !== 'undefined') {
               clearInterval(vimeoInterval);
               loadingVimeoDefer.resolve('done');
               callback();
             }
           }, 20);
-        } else if (typeof Vimeo !== 'undefined') {
+        } else if (typeof global$1$1.Vimeo !== 'undefined') {
           callback();
         } else {
-          loadingVimeoDefer.done(function () {
+          loadingVimeoDefer.done(() => {
             callback();
           });
         }
@@ -1055,250 +905,314 @@ function () {
         callback();
       }
     }
-  }]);
 
-  return VideoWorker;
-}();
+  }
+
+  function ready(callback) {
+    if ('complete' === document.readyState || 'interactive' === document.readyState) {
+      // Already ready or interactive, execute callback
+      callback();
+    } else {
+      document.addEventListener('DOMContentLoaded', callback, {
+        capture: true,
+        once: true,
+        passive: true
+      });
+    }
+  }
+
+  /* eslint-disable import/no-mutable-exports */
 
+  /* eslint-disable no-restricted-globals */
+  let win;
 
+  if ('undefined' !== typeof window) {
+    win = window;
+  } else if ('undefined' !== typeof global) {
+    win = global;
+  } else if ('undefined' !== typeof self) {
+    win = self;
+  } else {
+    win = {};
+  }
 
-/***/ }),
-/* 10 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  var global$1 = win;
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return jarallaxVideo; });
-/* harmony import */ var video_worker__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8);
-/* harmony import */ var video_worker__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(video_worker__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(global__WEBPACK_IMPORTED_MODULE_1__);
+  function jarallaxVideo(jarallax = global$1.jarallax) {
+    if ('undefined' === typeof jarallax) {
+      return;
+    }
 
+    const Jarallax = jarallax.constructor; // append video after when block will be visible.
+
+    const defOnScroll = Jarallax.prototype.onScroll;
+
+    Jarallax.prototype.onScroll = function () {
+      const self = this;
+      defOnScroll.apply(self);
+      const isReady = !self.isVideoInserted && self.video && (!self.options.videoLazyLoading || self.isElementInViewport) && !self.options.disableVideo();
+
+      if (isReady) {
+        self.isVideoInserted = true;
+        self.video.getVideo(video => {
+          const $parent = video.parentNode;
+          self.css(video, {
+            position: self.image.position,
+            top: '0px',
+            left: '0px',
+            right: '0px',
+            bottom: '0px',
+            width: '100%',
+            height: '100%',
+            maxWidth: 'none',
+            maxHeight: 'none',
+            pointerEvents: 'none',
+            transformStyle: 'preserve-3d',
+            backfaceVisibility: 'hidden',
+            willChange: 'transform,opacity',
+            margin: 0,
+            zIndex: -1
+          });
+          self.$video = video; // add Poster attribute to self-hosted video
 
-function jarallaxVideo() {
-  var jarallax = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : global__WEBPACK_IMPORTED_MODULE_1___default.a.jarallax;
+          if ('local' === self.video.type) {
+            if (self.image.src) {
+              self.$video.setAttribute('poster', self.image.src);
+            } else if (self.image.$item && 'IMG' === self.image.$item.tagName && self.image.$item.src) {
+              self.$video.setAttribute('poster', self.image.$item.src);
+            }
+          } // insert video tag
 
-  if (typeof jarallax === 'undefined') {
-    return;
-  }
 
-  var Jarallax = jarallax.constructor; // append video after when block will be visible.
-
-  var defOnScroll = Jarallax.prototype.onScroll;
-
-  Jarallax.prototype.onScroll = function () {
-    var self = this;
-    defOnScroll.apply(self);
-    var isReady = !self.isVideoInserted && self.video && (!self.options.videoLazyLoading || self.isElementInViewport) && !self.options.disableVideo();
-
-    if (isReady) {
-      self.isVideoInserted = true;
-      self.video.getVideo(function (video) {
-        var $parent = video.parentNode;
-        self.css(video, {
-          position: self.image.position,
-          top: '0px',
-          left: '0px',
-          right: '0px',
-          bottom: '0px',
-          width: '100%',
-          height: '100%',
-          maxWidth: 'none',
-          maxHeight: 'none',
-          margin: 0,
-          zIndex: -1
+          self.image.$container.appendChild(video); // remove parent video element (created by VideoWorker)
+
+          $parent.parentNode.removeChild($parent); // call onVideoInsert event
+
+          if (self.options.onVideoInsert) {
+            self.options.onVideoInsert.call(self);
+          }
         });
-        self.$video = video;
-        self.image.$container.appendChild(video); // remove parent video element (created by VideoWorker)
+      }
+    }; // cover video
 
-        $parent.parentNode.removeChild($parent);
-      });
-    }
-  }; // cover video
 
+    const defCoverImage = Jarallax.prototype.coverImage;
 
-  var defCoverImage = Jarallax.prototype.coverImage;
+    Jarallax.prototype.coverImage = function () {
+      const self = this;
+      const imageData = defCoverImage.apply(self);
+      const node = self.image.$item ? self.image.$item.nodeName : false;
 
-  Jarallax.prototype.coverImage = function () {
-    var self = this;
-    var imageData = defCoverImage.apply(self);
-    var node = self.image.$item ? self.image.$item.nodeName : false;
+      if (imageData && self.video && node && ('IFRAME' === node || 'VIDEO' === node)) {
+        let h = imageData.image.height;
+        let w = h * self.image.width / self.image.height;
+        let ml = (imageData.container.width - w) / 2;
+        let mt = imageData.image.marginTop;
 
-    if (imageData && self.video && node && (node === 'IFRAME' || node === 'VIDEO')) {
-      var h = imageData.image.height;
-      var w = h * self.image.width / self.image.height;
-      var ml = (imageData.container.width - w) / 2;
-      var mt = imageData.image.marginTop;
+        if (imageData.container.width > w) {
+          w = imageData.container.width;
+          h = w * self.image.height / self.image.width;
+          ml = 0;
+          mt += (imageData.image.height - h) / 2;
+        } // add video height over than need to hide controls
 
-      if (imageData.container.width > w) {
-        w = imageData.container.width;
-        h = w * self.image.height / self.image.width;
-        ml = 0;
-        mt += (imageData.image.height - h) / 2;
-      } // add video height over than need to hide controls
 
+        if ('IFRAME' === node) {
+          h += 400;
+          mt -= 200;
+        }
 
-      if (node === 'IFRAME') {
-        h += 400;
-        mt -= 200;
+        self.css(self.$video, {
+          width: `${w}px`,
+          marginLeft: `${ml}px`,
+          height: `${h}px`,
+          marginTop: `${mt}px`
+        });
       }
 
-      self.css(self.$video, {
-        width: "".concat(w, "px"),
-        marginLeft: "".concat(ml, "px"),
-        height: "".concat(h, "px"),
-        marginTop: "".concat(mt, "px")
-      });
-    }
-
-    return imageData;
-  }; // init video
+      return imageData;
+    }; // init video
 
 
-  var defInitImg = Jarallax.prototype.initImg;
+    const defInitImg = Jarallax.prototype.initImg;
 
-  Jarallax.prototype.initImg = function () {
-    var self = this;
-    var defaultResult = defInitImg.apply(self);
+    Jarallax.prototype.initImg = function () {
+      const self = this;
+      const defaultResult = defInitImg.apply(self);
 
-    if (!self.options.videoSrc) {
-      self.options.videoSrc = self.$item.getAttribute('data-jarallax-video') || null;
-    }
+      if (!self.options.videoSrc) {
+        self.options.videoSrc = self.$item.getAttribute('data-jarallax-video') || null;
+      }
 
-    if (self.options.videoSrc) {
-      self.defaultInitImgResult = defaultResult;
-      return true;
-    }
+      if (self.options.videoSrc) {
+        self.defaultInitImgResult = defaultResult;
+        return true;
+      }
 
-    return defaultResult;
-  };
+      return defaultResult;
+    };
 
-  var defCanInitParallax = Jarallax.prototype.canInitParallax;
+    const defCanInitParallax = Jarallax.prototype.canInitParallax;
 
-  Jarallax.prototype.canInitParallax = function () {
-    var self = this;
-    var defaultResult = defCanInitParallax.apply(self);
+    Jarallax.prototype.canInitParallax = function () {
+      const self = this;
+      let defaultResult = defCanInitParallax.apply(self);
 
-    if (!self.options.videoSrc) {
-      return defaultResult;
-    }
+      if (!self.options.videoSrc) {
+        return defaultResult;
+      } // Init video api
 
-    var video = new video_worker__WEBPACK_IMPORTED_MODULE_0___default.a(self.options.videoSrc, {
-      autoplay: true,
-      loop: self.options.videoLoop,
-      showContols: false,
-      startTime: self.options.videoStartTime || 0,
-      endTime: self.options.videoEndTime || 0,
-      mute: self.options.videoVolume ? 0 : 1,
-      volume: self.options.videoVolume || 0
-    });
-
-    if (video.isValid()) {
-      // if parallax will not be inited, we can add thumbnail on background.
-      if (!defaultResult) {
-        if (!self.defaultInitImgResult) {
-          video.getImageURL(function (url) {
-            // save default user styles
-            var curStyle = self.$item.getAttribute('style');
-
-            if (curStyle) {
-              self.$item.setAttribute('data-jarallax-original-styles', curStyle);
-            } // set new background
-
-
-            self.css(self.$item, {
-              'background-image': "url(\"".concat(url, "\")"),
-              'background-position': 'center',
-              'background-size': 'cover'
-            });
-          });
-        } // init video
 
-      } else {
-        video.on('ready', function () {
-          if (self.options.videoPlayOnlyVisible) {
-            var oldOnScroll = self.onScroll;
+      const video = new VideoWorker(self.options.videoSrc, {
+        autoplay: true,
+        loop: self.options.videoLoop,
+        showControls: false,
+        accessibilityHidden: true,
+        startTime: self.options.videoStartTime || 0,
+        endTime: self.options.videoEndTime || 0,
+        mute: self.options.videoVolume ? 0 : 1,
+        volume: self.options.videoVolume || 0
+      }); // call onVideoWorkerInit event
 
-            self.onScroll = function () {
-              oldOnScroll.apply(self);
+      if (self.options.onVideoWorkerInit) {
+        self.options.onVideoWorkerInit.call(self, video);
+      }
 
-              if (self.options.videoLoop || !self.options.videoLoop && !self.videoEnded) {
-                if (self.isVisible()) {
-                  video.play();
-                } else {
-                  video.pause();
-                }
-              }
-            };
-          } else {
-            video.play();
-          }
-        });
-        video.on('started', function () {
-          self.image.$default_item = self.image.$item;
-          self.image.$item = self.$video; // set video width and height
+      function resetDefaultImage() {
+        if (self.image.$default_item) {
+          self.image.$item = self.image.$default_item;
+          self.image.$item.style.display = 'block'; // set image width and height
 
-          self.image.width = self.video.videoWidth || 1280;
-          self.image.height = self.video.videoHeight || 720;
           self.coverImage();
-          self.clipContainer();
-          self.onScroll(); // hide image
+          self.onScroll();
+        }
+      }
 
-          if (self.image.$default_item) {
-            self.image.$default_item.style.display = 'none';
-          }
-        });
-        video.on('ended', function () {
-          self.videoEnded = true;
+      if (video.isValid()) {
+        // Force enable parallax.
+        // When the parallax disabled on mobile devices, we still need to display videos.
+        // https://github.com/nk-o/jarallax/issues/159
+        if (this.options.disableParallax()) {
+          defaultResult = true;
+          self.image.position = 'absolute';
+          self.options.type = 'scroll';
+          self.options.speed = 1;
+        } // if parallax will not be inited, we can add thumbnail on background.
+
+
+        if (!defaultResult) {
+          if (!self.defaultInitImgResult) {
+            video.getImageURL(url => {
+              // save default user styles
+              const curStyle = self.$item.getAttribute('style');
+
+              if (curStyle) {
+                self.$item.setAttribute('data-jarallax-original-styles', curStyle);
+              } // set new background
+
+
+              self.css(self.$item, {
+                'background-image': `url("${url}")`,
+                'background-position': 'center',
+                'background-size': 'cover'
+              });
+            });
+          } // init video
 
-          if (!self.options.videoLoop) {
-            // show image if Loop disabled
-            if (self.image.$default_item) {
-              self.image.$item = self.image.$default_item;
-              self.image.$item.style.display = 'block'; // set image width and height
+        } else {
+          video.on('ready', () => {
+            if (self.options.videoPlayOnlyVisible) {
+              const oldOnScroll = self.onScroll;
+
+              self.onScroll = function () {
+                oldOnScroll.apply(self);
+
+                if (!self.videoError && (self.options.videoLoop || !self.options.videoLoop && !self.videoEnded)) {
+                  if (self.isVisible()) {
+                    video.play();
+                  } else {
+                    video.pause();
+                  }
+                }
+              };
+            } else {
+              video.play();
+            }
+          });
+          video.on('started', () => {
+            self.image.$default_item = self.image.$item;
+            self.image.$item = self.$video; // set video width and height
 
-              self.coverImage();
-              self.clipContainer();
-              self.onScroll();
+            self.image.width = self.video.videoWidth || 1280;
+            self.image.height = self.video.videoHeight || 720;
+            self.coverImage();
+            self.onScroll(); // hide image
+
+            if (self.image.$default_item) {
+              self.image.$default_item.style.display = 'none';
             }
-          }
-        });
-        self.video = video; // set image if not exists
+          });
+          video.on('ended', () => {
+            self.videoEnded = true;
 
-        if (!self.defaultInitImgResult) {
-          // set empty image on local video if not defined
-          self.image.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+            if (!self.options.videoLoop) {
+              // show default image if Loop disabled.
+              resetDefaultImage();
+            }
+          });
+          video.on('error', () => {
+            self.videoError = true; // show default image if video loading error.
 
-          if (video.type !== 'local') {
-            video.getImageURL(function (url) {
-              self.image.bgImage = "url(\"".concat(url, "\")");
-              self.init();
-            });
-            return false;
+            resetDefaultImage();
+          });
+          self.video = video; // set image if not exists
+
+          if (!self.defaultInitImgResult) {
+            // set empty image on self-hosted video if not defined
+            self.image.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+
+            if ('local' !== video.type) {
+              video.getImageURL(url => {
+                self.image.bgImage = `url("${url}")`;
+                self.init();
+              });
+              return false;
+            }
           }
-
-          return true;
         }
       }
-    }
 
-    return defaultResult;
-  }; // Destroy video parallax
+      return defaultResult;
+    }; // Destroy video parallax
+
+
+    const defDestroy = Jarallax.prototype.destroy;
 
+    Jarallax.prototype.destroy = function () {
+      const self = this;
 
-  var defDestroy = Jarallax.prototype.destroy;
+      if (self.image.$default_item) {
+        self.image.$item = self.image.$default_item;
+        delete self.image.$default_item;
+      }
 
-  Jarallax.prototype.destroy = function () {
-    var self = this;
+      defDestroy.apply(self);
+    };
+  }
 
-    if (self.image.$default_item) {
-      self.image.$item = self.image.$default_item;
-      delete self.image.$default_item;
+  jarallaxVideo(); // data-jarallax-video initialization
+
+  ready(() => {
+    if ('undefined' !== typeof global$1.jarallax) {
+      global$1.jarallax(document.querySelectorAll('[data-jarallax-video]'));
     }
+  }); // We should add VideoWorker globally, since some project uses it.
 
-    defDestroy.apply(self);
-  };
-}
+  if (!global$1.VideoWorker) {
+    global$1.VideoWorker = VideoWorker;
+  }
+
+  return jarallaxVideo;
 
-/***/ })
-/******/ ]);
+}));
+//# sourceMappingURL=jarallax-video.js.map
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.min.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.min.js
deleted file mode 100644
index 41be61e5feb..00000000000
--- a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-video.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Name    : Video Background Extension for Jarallax
- * Version : 1.0.1
- * Author  : nK <https://nkdev.info>
- * GitHub  : https://github.com/nk-o/jarallax
- */!function(o){var i={};function n(e){if(i[e])return i[e].exports;var t=i[e]={i:e,l:!1,exports:{}};return o[e].call(t.exports,t,t.exports,n),t.l=!0,t.exports}n.m=o,n.c=i,n.d=function(e,t,o){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:o})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var i in t)n.d(o,i,function(e){return t[e]}.bind(null,i));return o},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=6)}([,,function(e,t){e.exports=function(e){"complete"===document.readyState||"interactive"===document.readyState?e.call():document.attachEvent?document.attachEvent("onreadystatechange",function(){"interactive"===document.readyState&&e.call()}):document.addEventListener&&document.addEventListener("DOMContentLoaded",e)}},,function(o,e,t){(function(e){var t;t="undefined"!=typeof window?window:void 0!==e?e:"undefined"!=typeof self?self:{},o.exports=t}).call(this,t(5))},function(e,t){function o(e){return(o="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var i;i=function(){return this}();try{i=i||new Function("return this")()}catch(e){"object"===("undefined"==typeof window?"undefined":o(window))&&(i=window)}e.exports=i},function(e,t,o){e.exports=o(7)},function(e,t,o){"use strict";o.r(t);var i=o(8),n=o.n(i),a=o(4),r=o.n(a),l=o(2),p=o.n(l),u=o(10);r.a.VideoWorker=r.a.VideoWorker||n.a,Object(u.default)(),p()(function(){"undefined"!=typeof jarallax&&jarallax(document.querySelectorAll("[data-jarallax-video]"))})},function(e,t,o){e.exports=o(9)},function(e,t,o){"use strict";function n(e){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function a(e,t){for(var o=0;o<t.length;o++){var i=t[o];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,i.key,i)}}function i(){this._done=[],this._fail=[]}o.r(t),o.d(t,"default",function(){return c}),i.prototype={execute:function(e,t){var o=e.length;for(t=Array.prototype.slice.call(t);o--;)e[o].apply(null,t)},resolve:function(){this.execute(this._done,arguments)},reject:function(){this.execute(this._fail,arguments)},done:function(e){this._done.push(e)},fail:function(e){this._fail.push(e)}};var r=0,l=0,p=0,u=0,s=0,d=new i,y=new i,c=function(){function i(e,t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,i);var o=this;o.url=e,o.options_default={autoplay:!1,loop:!1,mute:!1,volume:100,showContols:!0,startTime:0,endTime:0},o.options=o.extend({},o.options_default,t),o.videoID=o.parseURL(e),o.videoID&&(o.ID=r++,o.loadAPI(),o.init())}return function(e,t,o){t&&a(e.prototype,t),o&&a(e,o)}(i,[{key:"extend",value:function(o){var i=arguments;return o=o||{},Object.keys(arguments).forEach(function(t){i[t]&&Object.keys(i[t]).forEach(function(e){o[e]=i[t][e]})}),o}},{key:"parseURL",value:function(e){var t,o,i,n,a,r=!(!(t=e.match(/.*(?:youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=)([^#\&\?]*).*/))||11!==t[1].length)&&t[1],l=!(!(o=e.match(/https?:\/\/(?:www\.|player\.)?vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\d+)\/video\/|video\/|)(\d+)(?:$|\/|\?)/))||!o[3])&&o[3],p=(i=e.split(/,(?=mp4\:|webm\:|ogv\:|ogg\:)/),n={},a=0,i.forEach(function(e){var t=e.match(/^(mp4|webm|ogv|ogg)\:(.*)/);t&&t[1]&&t[2]&&(n["ogv"===t[1]?"ogg":t[1]]=t[2],a=1)}),!!a&&n);return r?(this.type="youtube",r):l?(this.type="vimeo",l):!!p&&(this.type="local",p)}},{key:"isValid",value:function(){return!!this.videoID}},{key:"on",value:function(e,t){this.userEventsList=this.userEventsList||[],(this.userEventsList[e]||(this.userEventsList[e]=[])).push(t)}},{key:"off",value:function(o,i){var n=this;this.userEventsList&&this.userEventsList[o]&&(i?this.userEventsList[o].forEach(function(e,t){e===i&&(n.userEventsList[o][t]=!1)}):delete this.userEventsList[o])}},{key:"fire",value:function(e){var t=this,o=[].slice.call(arguments,1);this.userEventsList&&void 0!==this.userEventsList[e]&&this.userEventsList[e].forEach(function(e){e&&e.apply(t,o)})}},{key:"play",value:function(e){var t=this;t.player&&("youtube"===t.type&&t.player.playVideo&&(void 0!==e&&t.player.seekTo(e||0),YT.PlayerState.PLAYING!==t.player.getPlayerState()&&t.player.playVideo()),"vimeo"===t.type&&(void 0!==e&&t.player.setCurrentTime(e),t.player.getPaused().then(function(e){e&&t.player.play()})),"local"===t.type&&(void 0!==e&&(t.player.currentTime=e),t.player.paused&&t.player.play()))}},{key:"pause",value:function(){var t=this;t.player&&("youtube"===t.type&&t.player.pauseVideo&&YT.PlayerState.PLAYING===t.player.getPlayerState()&&t.player.pauseVideo(),"vimeo"===t.type&&t.player.getPaused().then(function(e){e||t.player.pause()}),"local"===t.type&&(t.player.paused||t.player.pause()))}},{key:"mute",value:function(){var e=this;e.player&&("youtube"===e.type&&e.player.mute&&e.player.mute(),"vimeo"===e.type&&e.player.setVolume&&e.player.setVolume(0),"local"===e.type&&(e.$video.muted=!0))}},{key:"unmute",value:function(){var e=this;e.player&&("youtube"===e.type&&e.player.mute&&e.player.unMute(),"vimeo"===e.type&&e.player.setVolume&&e.player.setVolume(e.options.volume),"local"===e.type&&(e.$video.muted=!1))}},{key:"setVolume",value:function(e){var t=0<arguments.length&&void 0!==e&&e,o=this;o.player&&t&&("youtube"===o.type&&o.player.setVolume&&o.player.setVolume(t),"vimeo"===o.type&&o.player.setVolume&&o.player.setVolume(t),"local"===o.type&&(o.$video.volume=t/100))}},{key:"getVolume",value:function(t){var e=this;e.player?("youtube"===e.type&&e.player.getVolume&&t(e.player.getVolume()),"vimeo"===e.type&&e.player.getVolume&&e.player.getVolume().then(function(e){t(e)}),"local"===e.type&&t(100*e.$video.volume)):t(!1)}},{key:"getMuted",value:function(t){var e=this;e.player?("youtube"===e.type&&e.player.isMuted&&t(e.player.isMuted()),"vimeo"===e.type&&e.player.getVolume&&e.player.getVolume().then(function(e){t(!!e)}),"local"===e.type&&t(e.$video.muted)):t(null)}},{key:"getImageURL",value:function(t){var o=this;if(o.videoImage)t(o.videoImage);else{if("youtube"===o.type){var e=["maxresdefault","sddefault","hqdefault","0"],i=0,n=new Image;n.onload=function(){120!==(this.naturalWidth||this.width)||i===e.length-1?(o.videoImage="https://img.youtube.com/vi/".concat(o.videoID,"/").concat(e[i],".jpg"),t(o.videoImage)):(i++,this.src="https://img.youtube.com/vi/".concat(o.videoID,"/").concat(e[i],".jpg"))},n.src="https://img.youtube.com/vi/".concat(o.videoID,"/").concat(e[i],".jpg")}if("vimeo"===o.type){var a=new XMLHttpRequest;a.open("GET","https://vimeo.com/api/v2/video/".concat(o.videoID,".json"),!0),a.onreadystatechange=function(){if(4===this.readyState&&200<=this.status&&this.status<400){var e=JSON.parse(this.responseText);o.videoImage=e[0].thumbnail_large,t(o.videoImage)}},a.send(),a=null}}}},{key:"getIframe",value:function(e){this.getVideo(e)}},{key:"getVideo",value:function(p){var u=this;u.$video?p(u.$video):u.onAPIready(function(){var e,t;if(u.$video||((e=document.createElement("div")).style.display="none"),"youtube"===u.type){var o,i;u.playerOptions={},u.playerOptions.videoId=u.videoID,u.playerOptions.playerVars={autohide:1,rel:0,autoplay:0,playsinline:1},u.options.showContols||(u.playerOptions.playerVars.iv_load_policy=3,u.playerOptions.playerVars.modestbranding=1,u.playerOptions.playerVars.controls=0,u.playerOptions.playerVars.showinfo=0,u.playerOptions.playerVars.disablekb=1),u.playerOptions.events={onReady:function(t){if(u.options.mute?t.target.mute():u.options.volume&&t.target.setVolume(u.options.volume),u.options.autoplay&&u.play(u.options.startTime),u.fire("ready",t),u.options.loop&&!u.options.endTime){u.options.endTime=u.player.getDuration()-.1}setInterval(function(){u.getVolume(function(e){u.options.volume!==e&&(u.options.volume=e,u.fire("volumechange",t))})},150)},onStateChange:function(e){u.options.loop&&e.data===YT.PlayerState.ENDED&&u.play(u.options.startTime),o||e.data!==YT.PlayerState.PLAYING||(o=1,u.fire("started",e)),e.data===YT.PlayerState.PLAYING&&u.fire("play",e),e.data===YT.PlayerState.PAUSED&&u.fire("pause",e),e.data===YT.PlayerState.ENDED&&u.fire("ended",e),e.data===YT.PlayerState.PLAYING?i=setInterval(function(){u.fire("timeupdate",e),u.options.endTime&&u.player.getCurrentTime()>=u.options.endTime&&(u.options.loop?u.play(u.options.startTime):u.pause())},150):clearInterval(i)}};var n=!u.$video;if(n){var a=document.createElement("div");a.setAttribute("id",u.playerID),e.appendChild(a),document.body.appendChild(e)}u.player=u.player||new window.YT.Player(u.playerID,u.playerOptions),n&&(u.$video=document.getElementById(u.playerID),u.videoWidth=parseInt(u.$video.getAttribute("width"),10)||1280,u.videoHeight=parseInt(u.$video.getAttribute("height"),10)||720)}if("vimeo"===u.type){if(u.playerOptions={id:u.videoID,autopause:0,transparent:0,autoplay:u.options.autoplay?1:0,loop:u.options.loop?1:0,muted:u.options.mute?1:0},u.options.volume&&(u.playerOptions.volume=u.options.volume),u.options.showContols||(u.playerOptions.badge=0,u.playerOptions.byline=0,u.playerOptions.portrait=0,u.playerOptions.title=0,u.playerOptions.background=1),!u.$video){var r="";Object.keys(u.playerOptions).forEach(function(e){""!==r&&(r+="&"),r+="".concat(e,"=").concat(encodeURIComponent(u.playerOptions[e]))}),u.$video=document.createElement("iframe"),u.$video.setAttribute("id",u.playerID),u.$video.setAttribute("src","https://player.vimeo.com/video/".concat(u.videoID,"?").concat(r)),u.$video.setAttribute("frameborder","0"),u.$video.setAttribute("mozallowfullscreen",""),u.$video.setAttribute("allowfullscreen",""),e.appendChild(u.$video),document.body.appendChild(e)}var l;u.player=u.player||new Vimeo.Player(u.$video,u.playerOptions),u.options.startTime&&u.options.autoplay&&u.player.setCurrentTime(u.options.startTime),u.player.getVideoWidth().then(function(e){u.videoWidth=e||1280}),u.player.getVideoHeight().then(function(e){u.videoHeight=e||720}),u.player.on("timeupdate",function(e){l||(u.fire("started",e),l=1),u.fire("timeupdate",e),u.options.endTime&&u.options.endTime&&e.seconds>=u.options.endTime&&(u.options.loop?u.play(u.options.startTime):u.pause())}),u.player.on("play",function(e){u.fire("play",e),u.options.startTime&&0===e.seconds&&u.play(u.options.startTime)}),u.player.on("pause",function(e){u.fire("pause",e)}),u.player.on("ended",function(e){u.fire("ended",e)}),u.player.on("loaded",function(e){u.fire("ready",e)}),u.player.on("volumechange",function(e){u.fire("volumechange",e)})}"local"===u.type&&(u.$video||(u.$video=document.createElement("video"),u.options.showContols&&(u.$video.controls=!0),u.options.mute?u.$video.muted=!0:u.$video.volume&&(u.$video.volume=u.options.volume/100),u.options.loop&&(u.$video.loop=!0),u.$video.setAttribute("playsinline",""),u.$video.setAttribute("webkit-playsinline",""),u.$video.setAttribute("id",u.playerID),e.appendChild(u.$video),document.body.appendChild(e),Object.keys(u.videoID).forEach(function(e){!function(e,t,o){var i=document.createElement("source");i.src=t,i.type=o,e.appendChild(i)}(u.$video,u.videoID[e],"video/".concat(e))})),u.player=u.player||u.$video,u.player.addEventListener("playing",function(e){t||u.fire("started",e),t=1}),u.player.addEventListener("timeupdate",function(e){u.fire("timeupdate",e),u.options.endTime&&u.options.endTime&&this.currentTime>=u.options.endTime&&(u.options.loop?u.play(u.options.startTime):u.pause())}),u.player.addEventListener("play",function(e){u.fire("play",e)}),u.player.addEventListener("pause",function(e){u.fire("pause",e)}),u.player.addEventListener("ended",function(e){u.fire("ended",e)}),u.player.addEventListener("loadedmetadata",function(){u.videoWidth=this.videoWidth||1280,u.videoHeight=this.videoHeight||720,u.fire("ready"),u.options.autoplay&&u.play(u.options.startTime)}),u.player.addEventListener("volumechange",function(e){u.getVolume(function(e){u.options.volume=e}),u.fire("volumechange",e)}));p(u.$video)})}},{key:"init",value:function(){this.playerID="VideoWorker-".concat(this.ID)}},{key:"loadAPI",value:function(){if(!l||!p){var e="";if("youtube"!==this.type||l||(l=1,e="https://www.youtube.com/iframe_api"),"vimeo"===this.type&&!p){if(p=1,"undefined"!=typeof Vimeo)return;e="https://player.vimeo.com/api/player.js"}if(e){var t=document.createElement("script"),o=document.getElementsByTagName("head")[0];t.src=e,o.appendChild(t),t=o=null}}}},{key:"onAPIready",value:function(e){if("youtube"===this.type&&("undefined"!=typeof YT&&0!==YT.loaded||u?"object"===("undefined"==typeof YT?"undefined":n(YT))&&1===YT.loaded?e():d.done(function(){e()}):(u=1,window.onYouTubeIframeAPIReady=function(){window.onYouTubeIframeAPIReady=null,d.resolve("done"),e()})),"vimeo"===this.type)if("undefined"!=typeof Vimeo||s)"undefined"!=typeof Vimeo?e():y.done(function(){e()});else{s=1;var t=setInterval(function(){"undefined"!=typeof Vimeo&&(clearInterval(t),y.resolve("done"),e())},20)}"local"===this.type&&e()}}]),i}()},function(e,t,o){"use strict";o.r(t),o.d(t,"default",function(){return a});var i=o(8),r=o.n(i),n=o(4),p=o.n(n);function a(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:p.a.jarallax;if(void 0!==e){var t=e.constructor,i=t.prototype.onScroll;t.prototype.onScroll=function(){var o=this;i.apply(o),o.isVideoInserted||!o.video||o.options.videoLazyLoading&&!o.isElementInViewport||o.options.disableVideo()||(o.isVideoInserted=!0,o.video.getVideo(function(e){var t=e.parentNode;o.css(e,{position:o.image.position,top:"0px",left:"0px",right:"0px",bottom:"0px",width:"100%",height:"100%",maxWidth:"none",maxHeight:"none",margin:0,zIndex:-1}),o.$video=e,o.image.$container.appendChild(e),t.parentNode.removeChild(t)}))};var l=t.prototype.coverImage;t.prototype.coverImage=function(){var e=this,t=l.apply(e),o=!!e.image.$item&&e.image.$item.nodeName;if(t&&e.video&&o&&("IFRAME"===o||"VIDEO"===o)){var i=t.image.height,n=i*e.image.width/e.image.height,a=(t.container.width-n)/2,r=t.image.marginTop;t.container.width>n&&(i=(n=t.container.width)*e.image.height/e.image.width,a=0,r+=(t.image.height-i)/2),"IFRAME"===o&&(i+=400,r-=200),e.css(e.$video,{width:"".concat(n,"px"),marginLeft:"".concat(a,"px"),height:"".concat(i,"px"),marginTop:"".concat(r,"px")})}return t};var o=t.prototype.initImg;t.prototype.initImg=function(){var e=this,t=o.apply(e);return e.options.videoSrc||(e.options.videoSrc=e.$item.getAttribute("data-jarallax-video")||null),e.options.videoSrc?(e.defaultInitImgResult=t,!0):t};var n=t.prototype.canInitParallax;t.prototype.canInitParallax=function(){var o=this,e=n.apply(o);if(!o.options.videoSrc)return e;var t=new r.a(o.options.videoSrc,{autoplay:!0,loop:o.options.videoLoop,showContols:!1,startTime:o.options.videoStartTime||0,endTime:o.options.videoEndTime||0,mute:o.options.videoVolume?0:1,volume:o.options.videoVolume||0});if(t.isValid())if(e){if(t.on("ready",function(){if(o.options.videoPlayOnlyVisible){var e=o.onScroll;o.onScroll=function(){e.apply(o),!o.options.videoLoop&&(o.options.videoLoop||o.videoEnded)||(o.isVisible()?t.play():t.pause())}}else t.play()}),t.on("started",function(){o.image.$default_item=o.image.$item,o.image.$item=o.$video,o.image.width=o.video.videoWidth||1280,o.image.height=o.video.videoHeight||720,o.coverImage(),o.clipContainer(),o.onScroll(),o.image.$default_item&&(o.image.$default_item.style.display="none")}),t.on("ended",function(){o.videoEnded=!0,o.options.videoLoop||o.image.$default_item&&(o.image.$item=o.image.$default_item,o.image.$item.style.display="block",o.coverImage(),o.clipContainer(),o.onScroll())}),o.video=t,!o.defaultInitImgResult)return o.image.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7","local"===t.type||(t.getImageURL(function(e){o.image.bgImage='url("'.concat(e,'")'),o.init()}),!1)}else o.defaultInitImgResult||t.getImageURL(function(e){var t=o.$item.getAttribute("style");t&&o.$item.setAttribute("data-jarallax-original-styles",t),o.css(o.$item,{"background-image":'url("'.concat(e,'")'),"background-position":"center","background-size":"cover"})});return e};var a=t.prototype.destroy;t.prototype.destroy=function(){var e=this;e.image.$default_item&&(e.image.$item=e.image.$default_item,delete e.image.$default_item),a.apply(e)}}}}]);
-//# sourceMappingURL=jarallax-video.min.js.map
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-wrapper.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-wrapper.js
new file mode 100644
index 00000000000..9bba7116726
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax-wrapper.js
@@ -0,0 +1,12 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'Magento_PageBuilder/js/resource/jarallax/jarallax'
+], function(jarallax){
+    'use strict';
+
+    window.jarallax = window.jarallax || jarallax;
+});
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.js
index 50aca9b2fd4..b9e21e5f9cf 100644
--- a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.js
+++ b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.js
@@ -1,532 +1,280 @@
 /*!
- * Name    : Just Another Parallax [Jarallax]
- * Version : 1.12.5
- * Author  : nK <https://nkdev.info>
- * GitHub  : https://github.com/nk-o/jarallax
+ * Jarallax v2.0.3 (https://github.com/nk-o/jarallax)
+ * Copyright 2022 nK <https://nkdev.info>
+ * Licensed under MIT (https://github.com/nk-o/jarallax/blob/master/LICENSE)
  */
-/******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 10);
-/******/ })
-/************************************************************************/
-/******/ ([
-/* 0 */,
-/* 1 */,
-/* 2 */
-/***/ (function(module, exports) {
-
-module.exports = function (callback) {
-  if (document.readyState === 'complete' || document.readyState === 'interactive') {
-    // Already ready or interactive, execute callback
-    callback.call();
-  } else if (document.attachEvent) {
-    // Old browsers
-    document.attachEvent('onreadystatechange', function () {
-      if (document.readyState === 'interactive') callback.call();
-    });
-  } else if (document.addEventListener) {
-    // Modern browsers
-    document.addEventListener('DOMContentLoaded', callback);
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+      typeof define === 'function' && define.amd ? define(factory) :
+          (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.jarallax = factory());
+})(this, (function () { 'use strict';
+
+  function ready(callback) {
+    if ('complete' === document.readyState || 'interactive' === document.readyState) {
+      // Already ready or interactive, execute callback
+      callback();
+    } else {
+      document.addEventListener('DOMContentLoaded', callback, {
+        capture: true,
+        once: true,
+        passive: true
+      });
+    }
   }
-};
-
-/***/ }),
-/* 3 */
-/***/ (function(module, exports, __webpack_require__) {
-
-/* WEBPACK VAR INJECTION */(function(global) {var win;
-
-if (typeof window !== "undefined") {
-  win = window;
-} else if (typeof global !== "undefined") {
-  win = global;
-} else if (typeof self !== "undefined") {
-  win = self;
-} else {
-  win = {};
-}
-
-module.exports = win;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(4)))
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports) {
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-var g; // This works in non-strict mode
-
-g = function () {
-  return this;
-}();
-
-try {
-  // This works if eval is allowed (see CSP)
-  g = g || new Function("return this")();
-} catch (e) {
-  // This works if the window reference is available
-  if ((typeof window === "undefined" ? "undefined" : _typeof(window)) === "object") g = window;
-} // g can still be undefined, but nothing to do about it...
-// We return undefined, instead of nothing here, so it's
-// easier to handle this case. if(!global) { ...}
-
-
-module.exports = g;
-
-/***/ }),
-/* 5 */,
-/* 6 */,
-/* 7 */,
-/* 8 */,
-/* 9 */,
-/* 10 */
-/***/ (function(module, exports, __webpack_require__) {
-
-module.exports = __webpack_require__(11);
-
 
-/***/ }),
-/* 11 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
+  /* eslint-disable import/no-mutable-exports */
 
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var lite_ready__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var lite_ready__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lite_ready__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(global__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _jarallax_esm__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(12);
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-
-
- // no conflict
-
-var oldPlugin = global__WEBPACK_IMPORTED_MODULE_1__["window"].jarallax;
-global__WEBPACK_IMPORTED_MODULE_1__["window"].jarallax = _jarallax_esm__WEBPACK_IMPORTED_MODULE_2__["default"];
-
-global__WEBPACK_IMPORTED_MODULE_1__["window"].jarallax.noConflict = function () {
-  global__WEBPACK_IMPORTED_MODULE_1__["window"].jarallax = oldPlugin;
-  return this;
-}; // jQuery support
+  /* eslint-disable no-restricted-globals */
+  let win;
 
+  if ('undefined' !== typeof window) {
+    win = window;
+  } else if ('undefined' !== typeof global) {
+    win = global;
+  } else if ('undefined' !== typeof self) {
+    win = self;
+  } else {
+    win = {};
+  }
 
-if ('undefined' !== typeof global__WEBPACK_IMPORTED_MODULE_1__["jQuery"]) {
-  var jQueryPlugin = function jQueryPlugin() {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
+  var global$1 = win;
+
+  const {
+    navigator
+  } = global$1;
+  const isMobile = /*#__PURE__*/ /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+  let $deviceHelper;
+  /**
+   * The most popular mobile browsers changes height after page scroll and this generates image jumping.
+   * We can fix it using this workaround with vh units.
+   */
+
+  function getDeviceHeight() {
+    if (!$deviceHelper && document.body) {
+      $deviceHelper = document.createElement('div');
+      $deviceHelper.style.cssText = 'position: fixed; top: -9999px; left: 0; height: 100vh; width: 0;';
+      document.body.appendChild($deviceHelper);
     }
 
-    Array.prototype.unshift.call(args, this);
-    var res = _jarallax_esm__WEBPACK_IMPORTED_MODULE_2__["default"].apply(global__WEBPACK_IMPORTED_MODULE_1__["window"], args);
-    return 'object' !== _typeof(res) ? res : this;
-  };
-
-  jQueryPlugin.constructor = _jarallax_esm__WEBPACK_IMPORTED_MODULE_2__["default"].constructor; // no conflict
-
-  var oldJqPlugin = global__WEBPACK_IMPORTED_MODULE_1__["jQuery"].fn.jarallax;
-  global__WEBPACK_IMPORTED_MODULE_1__["jQuery"].fn.jarallax = jQueryPlugin;
-
-  global__WEBPACK_IMPORTED_MODULE_1__["jQuery"].fn.jarallax.noConflict = function () {
-    global__WEBPACK_IMPORTED_MODULE_1__["jQuery"].fn.jarallax = oldJqPlugin;
-    return this;
-  };
-} // data-jarallax initialization
-
-
-lite_ready__WEBPACK_IMPORTED_MODULE_0___default()(function () {
-  Object(_jarallax_esm__WEBPACK_IMPORTED_MODULE_2__["default"])(document.querySelectorAll('[data-jarallax]'));
-});
-
-/***/ }),
-/* 12 */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var lite_ready__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
-/* harmony import */ var lite_ready__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lite_ready__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3);
-/* harmony import */ var global__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(global__WEBPACK_IMPORTED_MODULE_1__);
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+    return ($deviceHelper ? $deviceHelper.clientHeight : 0) || global$1.innerHeight || document.documentElement.clientHeight;
+  } // Window height data
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+  let wndH;
 
-function _iterableToArrayLimit(arr, i) { if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return; var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-
-
-var navigator = global__WEBPACK_IMPORTED_MODULE_1__["window"].navigator;
-var isIE = -1 < navigator.userAgent.indexOf('MSIE ') || -1 < navigator.userAgent.indexOf('Trident/') || -1 < navigator.userAgent.indexOf('Edge/');
-var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-
-var supportTransform = function () {
-  var prefixes = 'transform WebkitTransform MozTransform'.split(' ');
-  var div = document.createElement('div');
-
-  for (var i = 0; i < prefixes.length; i += 1) {
-    if (div && div.style[prefixes[i]] !== undefined) {
-      return prefixes[i];
+  function updateWndVars() {
+    if (isMobile) {
+      wndH = getDeviceHeight();
+    } else {
+      wndH = global$1.innerHeight || document.documentElement.clientHeight;
     }
   }
 
-  return false;
-}();
-
-var $deviceHelper;
-/**
- * The most popular mobile browsers changes height after page scroll and this generates image jumping.
- * We can fix it using this workaround with vh units.
- */
+  updateWndVars();
+  global$1.addEventListener('resize', updateWndVars);
+  global$1.addEventListener('orientationchange', updateWndVars);
+  global$1.addEventListener('load', updateWndVars);
+  ready(() => {
+    updateWndVars();
+  }); // list with all jarallax instances
+  // need to render all in one scroll/resize event
 
-function getDeviceHeight() {
-  if (!$deviceHelper && document.body) {
-    $deviceHelper = document.createElement('div');
-    $deviceHelper.style.cssText = 'position: fixed; top: -9999px; left: 0; height: 100vh; width: 0;';
-    document.body.appendChild($deviceHelper);
-  }
+  const jarallaxList = []; // get all parents of the element.
 
-  return ($deviceHelper ? $deviceHelper.clientHeight : 0) || global__WEBPACK_IMPORTED_MODULE_1__["window"].innerHeight || document.documentElement.clientHeight;
-} // Window height data
+  function getParents(elem) {
+    const parents = [];
 
+    while (null !== elem.parentElement) {
+      elem = elem.parentElement;
 
-var wndH;
+      if (1 === elem.nodeType) {
+        parents.push(elem);
+      }
+    }
 
-function updateWndVars() {
-  if (isMobile) {
-    wndH = getDeviceHeight();
-  } else {
-    wndH = global__WEBPACK_IMPORTED_MODULE_1__["window"].innerHeight || document.documentElement.clientHeight;
+    return parents;
   }
-}
-
-updateWndVars();
-global__WEBPACK_IMPORTED_MODULE_1__["window"].addEventListener('resize', updateWndVars);
-global__WEBPACK_IMPORTED_MODULE_1__["window"].addEventListener('orientationchange', updateWndVars);
-global__WEBPACK_IMPORTED_MODULE_1__["window"].addEventListener('load', updateWndVars);
-lite_ready__WEBPACK_IMPORTED_MODULE_0___default()(function () {
-  updateWndVars({
-    type: 'dom-loaded'
-  });
-}); // list with all jarallax instances
-// need to render all in one scroll/resize event
 
-var jarallaxList = []; // get all parents of the element.
-
-function getParents(elem) {
-  var parents = [];
-
-  while (null !== elem.parentElement) {
-    elem = elem.parentElement;
-
-    if (1 === elem.nodeType) {
-      parents.push(elem);
+  function updateParallax() {
+    if (!jarallaxList.length) {
+      return;
     }
-  }
 
-  return parents;
-}
-
-function updateParallax() {
-  if (!jarallaxList.length) {
-    return;
-  }
-
-  jarallaxList.forEach(function (data, k) {
-    var instance = data.instance,
-        oldData = data.oldData;
-    var clientRect = instance.$item.getBoundingClientRect();
-    var newData = {
-      width: clientRect.width,
-      height: clientRect.height,
-      top: clientRect.top,
-      bottom: clientRect.bottom,
-      wndW: global__WEBPACK_IMPORTED_MODULE_1__["window"].innerWidth,
-      wndH: wndH
-    };
-    var isResized = !oldData || oldData.wndW !== newData.wndW || oldData.wndH !== newData.wndH || oldData.width !== newData.width || oldData.height !== newData.height;
-    var isScrolled = isResized || !oldData || oldData.top !== newData.top || oldData.bottom !== newData.bottom;
-    jarallaxList[k].oldData = newData;
+    jarallaxList.forEach((data, k) => {
+      const {
+        instance,
+        oldData
+      } = data;
+      const clientRect = instance.$item.getBoundingClientRect();
+      const newData = {
+        width: clientRect.width,
+        height: clientRect.height,
+        top: clientRect.top,
+        bottom: clientRect.bottom,
+        wndW: global$1.innerWidth,
+        wndH
+      };
+      const isResized = !oldData || oldData.wndW !== newData.wndW || oldData.wndH !== newData.wndH || oldData.width !== newData.width || oldData.height !== newData.height;
+      const isScrolled = isResized || !oldData || oldData.top !== newData.top || oldData.bottom !== newData.bottom;
+      jarallaxList[k].oldData = newData;
 
-    if (isResized) {
-      instance.onResize();
-    }
+      if (isResized) {
+        instance.onResize();
+      }
 
-    if (isScrolled) {
-      instance.onScroll();
-    }
-  });
-  global__WEBPACK_IMPORTED_MODULE_1__["window"].requestAnimationFrame(updateParallax);
-}
-
-var instanceID = 0; // Jarallax class
-
-var Jarallax = /*#__PURE__*/function () {
-  function Jarallax(item, userOptions) {
-    _classCallCheck(this, Jarallax);
-
-    var self = this;
-    self.instanceID = instanceID;
-    instanceID += 1;
-    self.$item = item;
-    self.defaults = {
-      type: 'scroll',
-      // type of parallax: scroll, scale, opacity, scale-opacity, scroll-opacity
-      speed: 0.5,
-      // supported value from -1 to 2
-      imgSrc: null,
-      imgElement: '.jarallax-img',
-      imgSize: 'cover',
-      imgPosition: '50% 50%',
-      imgRepeat: 'no-repeat',
-      // supported only for background, not for <img> tag
-      keepImg: false,
-      // keep <img> tag in it's default place
-      elementInViewport: null,
-      zIndex: -100,
-      disableParallax: false,
-      disableVideo: false,
-      // video
-      videoSrc: null,
-      videoStartTime: 0,
-      videoEndTime: 0,
-      videoVolume: 0,
-      videoLoop: true,
-      videoPlayOnlyVisible: true,
-      videoLazyLoading: true,
-      // events
-      onScroll: null,
-      // function(calculations) {}
-      onInit: null,
-      // function() {}
-      onDestroy: null,
-      // function() {}
-      onCoverImage: null // function() {}
-
-    }; // prepare data-options
-
-    var dataOptions = self.$item.dataset || {};
-    var pureDataOptions = {};
-    Object.keys(dataOptions).forEach(function (key) {
-      var loweCaseOption = key.substr(0, 1).toLowerCase() + key.substr(1);
-
-      if (loweCaseOption && 'undefined' !== typeof self.defaults[loweCaseOption]) {
-        pureDataOptions[loweCaseOption] = dataOptions[key];
+      if (isScrolled) {
+        instance.onScroll();
       }
     });
-    self.options = self.extend({}, self.defaults, pureDataOptions, userOptions);
-    self.pureOptions = self.extend({}, self.options); // prepare 'true' and 'false' strings to boolean
-
-    Object.keys(self.options).forEach(function (key) {
-      if ('true' === self.options[key]) {
-        self.options[key] = true;
-      } else if ('false' === self.options[key]) {
-        self.options[key] = false;
-      }
-    }); // fix speed option [-1.0, 2.0]
-
-    self.options.speed = Math.min(2, Math.max(-1, parseFloat(self.options.speed))); // prepare disableParallax callback
+    global$1.requestAnimationFrame(updateParallax);
+  }
 
-    if ('string' === typeof self.options.disableParallax) {
-      self.options.disableParallax = new RegExp(self.options.disableParallax);
-    }
+  let instanceID = 0; // Jarallax class
+
+  class Jarallax {
+    constructor(item, userOptions) {
+      const self = this;
+      self.instanceID = instanceID;
+      instanceID += 1;
+      self.$item = item;
+      self.defaults = {
+        type: 'scroll',
+        // type of parallax: scroll, scale, opacity, scale-opacity, scroll-opacity
+        speed: 0.5,
+        // supported value from -1 to 2
+        imgSrc: null,
+        imgElement: '.jarallax-img',
+        imgSize: 'cover',
+        imgPosition: '50% 50%',
+        imgRepeat: 'no-repeat',
+        // supported only for background, not for <img> tag
+        keepImg: false,
+        // keep <img> tag in it's default place
+        elementInViewport: null,
+        zIndex: -100,
+        disableParallax: false,
+        disableVideo: false,
+        // video
+        videoSrc: null,
+        videoStartTime: 0,
+        videoEndTime: 0,
+        videoVolume: 0,
+        videoLoop: true,
+        videoPlayOnlyVisible: true,
+        videoLazyLoading: true,
+        // events
+        onScroll: null,
+        // function(calculations) {}
+        onInit: null,
+        // function() {}
+        onDestroy: null,
+        // function() {}
+        onCoverImage: null // function() {}
+
+      }; // prepare data-options
+
+      const dataOptions = self.$item.dataset || {};
+      const pureDataOptions = {};
+      Object.keys(dataOptions).forEach(key => {
+        const loweCaseOption = key.substr(0, 1).toLowerCase() + key.substr(1);
+
+        if (loweCaseOption && 'undefined' !== typeof self.defaults[loweCaseOption]) {
+          pureDataOptions[loweCaseOption] = dataOptions[key];
+        }
+      });
+      self.options = self.extend({}, self.defaults, pureDataOptions, userOptions);
+      self.pureOptions = self.extend({}, self.options); // prepare 'true' and 'false' strings to boolean
+
+      Object.keys(self.options).forEach(key => {
+        if ('true' === self.options[key]) {
+          self.options[key] = true;
+        } else if ('false' === self.options[key]) {
+          self.options[key] = false;
+        }
+      }); // fix speed option [-1.0, 2.0]
 
-    if (self.options.disableParallax instanceof RegExp) {
-      var disableParallaxRegexp = self.options.disableParallax;
+      self.options.speed = Math.min(2, Math.max(-1, parseFloat(self.options.speed))); // prepare disableParallax callback
 
-      self.options.disableParallax = function () {
-        return disableParallaxRegexp.test(navigator.userAgent);
-      };
-    }
+      if ('string' === typeof self.options.disableParallax) {
+        self.options.disableParallax = new RegExp(self.options.disableParallax);
+      }
 
-    if ('function' !== typeof self.options.disableParallax) {
-      self.options.disableParallax = function () {
-        return false;
-      };
-    } // prepare disableVideo callback
+      if (self.options.disableParallax instanceof RegExp) {
+        const disableParallaxRegexp = self.options.disableParallax;
 
+        self.options.disableParallax = () => disableParallaxRegexp.test(navigator.userAgent);
+      }
 
-    if ('string' === typeof self.options.disableVideo) {
-      self.options.disableVideo = new RegExp(self.options.disableVideo);
-    }
+      if ('function' !== typeof self.options.disableParallax) {
+        self.options.disableParallax = () => false;
+      } // prepare disableVideo callback
 
-    if (self.options.disableVideo instanceof RegExp) {
-      var disableVideoRegexp = self.options.disableVideo;
 
-      self.options.disableVideo = function () {
-        return disableVideoRegexp.test(navigator.userAgent);
-      };
-    }
+      if ('string' === typeof self.options.disableVideo) {
+        self.options.disableVideo = new RegExp(self.options.disableVideo);
+      }
 
-    if ('function' !== typeof self.options.disableVideo) {
-      self.options.disableVideo = function () {
-        return false;
-      };
-    } // custom element to check if parallax in viewport
+      if (self.options.disableVideo instanceof RegExp) {
+        const disableVideoRegexp = self.options.disableVideo;
 
+        self.options.disableVideo = () => disableVideoRegexp.test(navigator.userAgent);
+      }
 
-    var elementInVP = self.options.elementInViewport; // get first item from array
+      if ('function' !== typeof self.options.disableVideo) {
+        self.options.disableVideo = () => false;
+      } // custom element to check if parallax in viewport
 
-    if (elementInVP && 'object' === _typeof(elementInVP) && 'undefined' !== typeof elementInVP.length) {
-      var _elementInVP = elementInVP;
 
-      var _elementInVP2 = _slicedToArray(_elementInVP, 1);
+      let elementInVP = self.options.elementInViewport; // get first item from array
 
-      elementInVP = _elementInVP2[0];
-    } // check if dom element
+      if (elementInVP && 'object' === typeof elementInVP && 'undefined' !== typeof elementInVP.length) {
+        [elementInVP] = elementInVP;
+      } // check if dom element
 
 
-    if (!(elementInVP instanceof Element)) {
-      elementInVP = null;
-    }
+      if (!(elementInVP instanceof Element)) {
+        elementInVP = null;
+      }
 
-    self.options.elementInViewport = elementInVP;
-    self.image = {
-      src: self.options.imgSrc || null,
-      $container: null,
-      useImgTag: false,
-      // position fixed is needed for the most of browsers because absolute position have glitches
-      // on MacOS with smooth scroll there is a huge lags with absolute position - https://github.com/nk-o/jarallax/issues/75
-      // on mobile devices better scrolled with absolute position
-      position: /iPad|iPhone|iPod|Android/.test(navigator.userAgent) ? 'absolute' : 'fixed'
-    };
+      self.options.elementInViewport = elementInVP;
+      self.image = {
+        src: self.options.imgSrc || null,
+        $container: null,
+        useImgTag: false,
+        // 1. Position fixed is needed for the most of browsers because absolute position have glitches
+        // 2. On MacOS with smooth scroll there is a huge lags with absolute position - https://github.com/nk-o/jarallax/issues/75
+        // 3. Previously used 'absolute' for mobile devices. But we re-tested on iPhone 12 and 'fixed' position is working better, then 'absolute', so for now position is always 'fixed'
+        position: 'fixed'
+      };
 
-    if (self.initImg() && self.canInitParallax()) {
-      self.init();
-    }
-  } // add styles to element
-  // eslint-disable-next-line class-methods-use-this
+      if (self.initImg() && self.canInitParallax()) {
+        self.init();
+      }
+    } // add styles to element
+    // eslint-disable-next-line class-methods-use-this
 
 
-  _createClass(Jarallax, [{
-    key: "css",
-    value: function css(el, styles) {
+    css(el, styles) {
       if ('string' === typeof styles) {
-        return global__WEBPACK_IMPORTED_MODULE_1__["window"].getComputedStyle(el).getPropertyValue(styles);
-      } // add transform property with vendor prefix
-
-
-      if (styles.transform && supportTransform) {
-        styles[supportTransform] = styles.transform;
+        return global$1.getComputedStyle(el).getPropertyValue(styles);
       }
 
-      Object.keys(styles).forEach(function (key) {
+      Object.keys(styles).forEach(key => {
         el.style[key] = styles[key];
       });
       return el;
     } // Extend like jQuery.extend
     // eslint-disable-next-line class-methods-use-this
 
-  }, {
-    key: "extend",
-    value: function extend(out) {
-      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        args[_key - 1] = arguments[_key];
-      }
 
+    extend(out, ...args) {
       out = out || {};
-      Object.keys(args).forEach(function (i) {
+      Object.keys(args).forEach(i => {
         if (!args[i]) {
           return;
         }
 
-        Object.keys(args[i]).forEach(function (key) {
+        Object.keys(args[i]).forEach(key => {
           out[key] = args[i][key];
         });
       });
@@ -534,22 +282,20 @@ var Jarallax = /*#__PURE__*/function () {
     } // get window size and scroll position. Useful for extensions
     // eslint-disable-next-line class-methods-use-this
 
-  }, {
-    key: "getWindowData",
-    value: function getWindowData() {
+
+    getWindowData() {
       return {
-        width: global__WEBPACK_IMPORTED_MODULE_1__["window"].innerWidth || document.documentElement.clientWidth,
+        width: global$1.innerWidth || document.documentElement.clientWidth,
         height: wndH,
         y: document.documentElement.scrollTop
       };
     } // Jarallax functions
 
-  }, {
-    key: "initImg",
-    value: function initImg() {
-      var self = this; // find image element
 
-      var $imgElement = self.options.imgElement;
+    initImg() {
+      const self = this; // find image element
+
+      let $imgElement = self.options.imgElement;
 
       if ($imgElement && 'string' === typeof $imgElement) {
         $imgElement = self.$item.querySelector($imgElement);
@@ -589,16 +335,14 @@ var Jarallax = /*#__PURE__*/function () {
 
       return !(!self.image.bgImage || 'none' === self.image.bgImage);
     }
-  }, {
-    key: "canInitParallax",
-    value: function canInitParallax() {
-      return supportTransform && !this.options.disableParallax();
+
+    canInitParallax() {
+      return !this.options.disableParallax();
     }
-  }, {
-    key: "init",
-    value: function init() {
-      var self = this;
-      var containerStyles = {
+
+    init() {
+      const self = this;
+      const containerStyles = {
         position: 'absolute',
         top: 0,
         left: 0,
@@ -606,7 +350,7 @@ var Jarallax = /*#__PURE__*/function () {
         height: '100%',
         overflow: 'hidden'
       };
-      var imageStyles = {
+      let imageStyles = {
         pointerEvents: 'none',
         transformStyle: 'preserve-3d',
         backfaceVisibility: 'hidden',
@@ -615,14 +359,14 @@ var Jarallax = /*#__PURE__*/function () {
 
       if (!self.options.keepImg) {
         // save default user styles
-        var curStyle = self.$item.getAttribute('style');
+        const curStyle = self.$item.getAttribute('style');
 
         if (curStyle) {
           self.$item.setAttribute('data-jarallax-original-styles', curStyle);
         }
 
         if (self.image.useImgTag) {
-          var curImgStyle = self.image.$item.getAttribute('style');
+          const curImgStyle = self.image.$item.getAttribute('style');
 
           if (curImgStyle) {
             self.image.$item.setAttribute('data-jarallax-original-styles', curImgStyle);
@@ -648,23 +392,24 @@ var Jarallax = /*#__PURE__*/function () {
       self.css(self.image.$container, containerStyles);
       self.css(self.image.$container, {
         'z-index': self.options.zIndex
-      }); // fix for IE https://github.com/nk-o/jarallax/issues/110
+      }); // it will remove some image overlapping
+      // overlapping occur due to an image position fixed inside absolute position element
+      // needed only when background in fixed position
 
-      if (isIE) {
+      if ('fixed' === this.image.position) {
         self.css(self.image.$container, {
-          opacity: 0.9999
+          '-webkit-clip-path': 'polygon(0 0, 100% 0, 100% 100%, 0 100%)',
+          'clip-path': 'polygon(0 0, 100% 0, 100% 100%, 0 100%)'
         });
       }
 
-      self.image.$container.setAttribute('id', "jarallax-container-".concat(self.instanceID));
+      self.image.$container.setAttribute('id', `jarallax-container-${self.instanceID}`);
       self.$item.appendChild(self.image.$container); // use img tag
 
       if (self.image.useImgTag) {
         imageStyles = self.extend({
           'object-fit': self.options.imgSize,
           'object-position': self.options.imgPosition,
-          // support for plugin https://github.com/bfred-it/object-fit-images
-          'font-family': "object-fit: ".concat(self.options.imgSize, "; object-position: ").concat(self.options.imgPosition, ";"),
           'max-width': 'none'
         }, containerStyles, imageStyles); // use div with background image
       } else {
@@ -675,7 +420,7 @@ var Jarallax = /*#__PURE__*/function () {
             'background-position': self.options.imgPosition,
             'background-size': self.options.imgSize,
             'background-repeat': self.options.imgRepeat,
-            'background-image': self.image.bgImage || "url(\"".concat(self.image.src, "\")")
+            'background-image': self.image.bgImage || `url("${self.image.src}")`
           }, containerStyles, imageStyles);
         }
       }
@@ -688,10 +433,10 @@ var Jarallax = /*#__PURE__*/function () {
 
 
       if ('fixed' === self.image.position) {
-        var $parents = getParents(self.$item).filter(function (el) {
-          var styles = global__WEBPACK_IMPORTED_MODULE_1__["window"].getComputedStyle(el);
-          var parentTransform = styles['-webkit-transform'] || styles['-moz-transform'] || styles.transform;
-          var overflowRegex = /(auto|scroll)/;
+        const $parents = getParents(self.$item).filter(el => {
+          const styles = global$1.getComputedStyle(el);
+          const parentTransform = styles['-webkit-transform'] || styles['-moz-transform'] || styles.transform;
+          const overflowRegex = /(auto|scroll)/;
           return parentTransform && 'none' !== parentTransform || overflowRegex.test(styles.overflow + styles['overflow-y'] + styles['overflow-x']);
         });
         self.image.position = $parents.length ? 'absolute' : 'fixed';
@@ -720,35 +465,32 @@ var Jarallax = /*#__PURE__*/function () {
       self.addToParallaxList();
     } // add to parallax instances list
 
-  }, {
-    key: "addToParallaxList",
-    value: function addToParallaxList() {
+
+    addToParallaxList() {
       jarallaxList.push({
         instance: this
       });
 
       if (1 === jarallaxList.length) {
-        global__WEBPACK_IMPORTED_MODULE_1__["window"].requestAnimationFrame(updateParallax);
+        global$1.requestAnimationFrame(updateParallax);
       }
     } // remove from parallax instances list
 
-  }, {
-    key: "removeFromParallaxList",
-    value: function removeFromParallaxList() {
-      var self = this;
-      jarallaxList.forEach(function (data, key) {
+
+    removeFromParallaxList() {
+      const self = this;
+      jarallaxList.forEach((data, key) => {
         if (data.instance.instanceID === self.instanceID) {
           jarallaxList.splice(key, 1);
         }
       });
     }
-  }, {
-    key: "destroy",
-    value: function destroy() {
-      var self = this;
+
+    destroy() {
+      const self = this;
       self.removeFromParallaxList(); // return styles on container as before jarallax init
 
-      var originalStylesTag = self.$item.getAttribute('data-jarallax-original-styles');
+      const originalStylesTag = self.$item.getAttribute('data-jarallax-original-styles');
       self.$item.removeAttribute('data-jarallax-original-styles'); // null occurs if there is no style tag before jarallax init
 
       if (!originalStylesTag) {
@@ -759,7 +501,7 @@ var Jarallax = /*#__PURE__*/function () {
 
       if (self.image.useImgTag) {
         // return styles on img tag as before jarallax init
-        var originalStylesImgTag = self.image.$item.getAttribute('data-jarallax-original-styles');
+        const originalStylesImgTag = self.image.$item.getAttribute('data-jarallax-original-styles');
         self.image.$item.removeAttribute('data-jarallax-original-styles'); // null occurs if there is no style tag before jarallax init
 
         if (!originalStylesImgTag) {
@@ -775,10 +517,6 @@ var Jarallax = /*#__PURE__*/function () {
       } // remove additional dom elements
 
 
-      if (self.$clipStyles) {
-        self.$clipStyles.parentNode.removeChild(self.$clipStyles);
-      }
-
       if (self.image.$container) {
         self.image.$container.parentNode.removeChild(self.image.$container);
       } // call onDestroy event
@@ -790,51 +528,24 @@ var Jarallax = /*#__PURE__*/function () {
 
 
       delete self.$item.jarallax;
-    } // it will remove some image overlapping
-    // overlapping occur due to an image position fixed inside absolute position element
-
-  }, {
-    key: "clipContainer",
-    value: function clipContainer() {
-      // needed only when background in fixed position
-      if ('fixed' !== this.image.position) {
-        return;
-      }
-
-      var self = this;
-      var rect = self.image.$container.getBoundingClientRect();
-      var width = rect.width,
-          height = rect.height;
+    } // Fallback for removed function.
+    // Does nothing now.
+    // eslint-disable-next-line class-methods-use-this
 
-      if (!self.$clipStyles) {
-        self.$clipStyles = document.createElement('style');
-        self.$clipStyles.setAttribute('type', 'text/css');
-        self.$clipStyles.setAttribute('id', "jarallax-clip-".concat(self.instanceID));
-        var head = document.head || document.getElementsByTagName('head')[0];
-        head.appendChild(self.$clipStyles);
-      } // clip is used for old browsers.
-      // clip-path for modern browsers (also fixes Safari v14 bug https://github.com/nk-o/jarallax/issues/181 ).
 
+    clipContainer() {}
 
-      var styles = "#jarallax-container-".concat(self.instanceID, " {\n            clip: rect(0 ").concat(width, "px ").concat(height, "px 0);\n            clip: rect(0, ").concat(width, "px, ").concat(height, "px, 0);\n            -webkit-clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);\n            clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);\n        }"); // add clip styles inline (this method need for support IE8 and less browsers)
-
-      if (self.$clipStyles.styleSheet) {
-        self.$clipStyles.styleSheet.cssText = styles;
-      } else {
-        self.$clipStyles.innerHTML = styles;
-      }
-    }
-  }, {
-    key: "coverImage",
-    value: function coverImage() {
-      var self = this;
-      var rect = self.image.$container.getBoundingClientRect();
-      var contH = rect.height;
-      var speed = self.options.speed;
-      var isScroll = 'scroll' === self.options.type || 'scroll-opacity' === self.options.type;
-      var scrollDist = 0;
-      var resultH = contH;
-      var resultMT = 0; // scroll parallax
+    coverImage() {
+      const self = this;
+      const rect = self.image.$container.getBoundingClientRect();
+      const contH = rect.height;
+      const {
+        speed
+      } = self.options;
+      const isScroll = 'scroll' === self.options.type || 'scroll-opacity' === self.options.type;
+      let scrollDist = 0;
+      let resultH = contH;
+      let resultMT = 0; // scroll parallax
 
       if (isScroll) {
         // scroll distance and height for image
@@ -871,10 +582,10 @@ var Jarallax = /*#__PURE__*/function () {
 
 
       self.css(self.image.$item, {
-        height: "".concat(resultH, "px"),
-        marginTop: "".concat(resultMT, "px"),
-        left: 'fixed' === self.image.position ? "".concat(rect.left, "px") : '0',
-        width: "".concat(rect.width, "px")
+        height: `${resultH}px`,
+        marginTop: `${resultMT}px`,
+        left: 'fixed' === self.image.position ? `${rect.left}px` : '0',
+        width: `${rect.width}px`
       }); // call onCoverImage event
 
       if (self.options.onCoverImage) {
@@ -890,42 +601,40 @@ var Jarallax = /*#__PURE__*/function () {
         container: rect
       };
     }
-  }, {
-    key: "isVisible",
-    value: function isVisible() {
+
+    isVisible() {
       return this.isElementInViewport || false;
     }
-  }, {
-    key: "onScroll",
-    value: function onScroll(force) {
-      var self = this;
-      var rect = self.$item.getBoundingClientRect();
-      var contT = rect.top;
-      var contH = rect.height;
-      var styles = {}; // check if in viewport
 
-      var viewportRect = rect;
+    onScroll(force) {
+      const self = this;
+      const rect = self.$item.getBoundingClientRect();
+      const contT = rect.top;
+      const contH = rect.height;
+      const styles = {}; // check if in viewport
+
+      let viewportRect = rect;
 
       if (self.options.elementInViewport) {
         viewportRect = self.options.elementInViewport.getBoundingClientRect();
       }
 
-      self.isElementInViewport = 0 <= viewportRect.bottom && 0 <= viewportRect.right && viewportRect.top <= wndH && viewportRect.left <= global__WEBPACK_IMPORTED_MODULE_1__["window"].innerWidth; // stop calculations if item is not in viewport
+      self.isElementInViewport = 0 <= viewportRect.bottom && 0 <= viewportRect.right && viewportRect.top <= wndH && viewportRect.left <= global$1.innerWidth; // stop calculations if item is not in viewport
 
       if (force ? false : !self.isElementInViewport) {
         return;
       } // calculate parallax helping variables
 
 
-      var beforeTop = Math.max(0, contT);
-      var beforeTopEnd = Math.max(0, contH + contT);
-      var afterTop = Math.max(0, -contT);
-      var beforeBottom = Math.max(0, contT + contH - wndH);
-      var beforeBottomEnd = Math.max(0, contH - (contT + contH - wndH));
-      var afterBottom = Math.max(0, -contT + wndH - contH);
-      var fromViewportCenter = 1 - 2 * ((wndH - contT) / (wndH + contH)); // calculate on how percent of section is visible
+      const beforeTop = Math.max(0, contT);
+      const beforeTopEnd = Math.max(0, contH + contT);
+      const afterTop = Math.max(0, -contT);
+      const beforeBottom = Math.max(0, contT + contH - wndH);
+      const beforeBottomEnd = Math.max(0, contH - (contT + contH - wndH));
+      const afterBottom = Math.max(0, -contT + wndH - contH);
+      const fromViewportCenter = 1 - 2 * ((wndH - contT) / (wndH + contH)); // calculate on how percent of section is visible
 
-      var visiblePercent = 1;
+      let visiblePercent = 1;
 
       if (contH < wndH) {
         visiblePercent = 1 - (afterTop || beforeBottom) / contH;
@@ -943,7 +652,7 @@ var Jarallax = /*#__PURE__*/function () {
 
 
       if ('scale' === self.options.type || 'scale-opacity' === self.options.type) {
-        var scale = 1;
+        let scale = 1;
 
         if (0 > self.options.speed) {
           scale -= self.options.speed * visiblePercent;
@@ -951,18 +660,18 @@ var Jarallax = /*#__PURE__*/function () {
           scale += self.options.speed * (1 - visiblePercent);
         }
 
-        styles.transform = "scale(".concat(scale, ") translate3d(0,0,0)");
+        styles.transform = `scale(${scale}) translate3d(0,0,0)`;
       } // scroll
 
 
       if ('scroll' === self.options.type || 'scroll-opacity' === self.options.type) {
-        var positionY = self.parallaxScrollDistance * fromViewportCenter; // fix if parallax block in absolute position
+        let positionY = self.parallaxScrollDistance * fromViewportCenter; // fix if parallax block in absolute position
 
         if ('absolute' === self.image.position) {
           positionY -= contT;
         }
 
-        styles.transform = "translate3d(0,".concat(positionY, "px,0)");
+        styles.transform = `translate3d(0,${positionY}px,0)`;
       }
 
       self.css(self.image.$item, styles); // call onScroll event
@@ -970,64 +679,82 @@ var Jarallax = /*#__PURE__*/function () {
       if (self.options.onScroll) {
         self.options.onScroll.call(self, {
           section: rect,
-          beforeTop: beforeTop,
-          beforeTopEnd: beforeTopEnd,
-          afterTop: afterTop,
-          beforeBottom: beforeBottom,
-          beforeBottomEnd: beforeBottomEnd,
-          afterBottom: afterBottom,
-          visiblePercent: visiblePercent,
-          fromViewportCenter: fromViewportCenter
+          beforeTop,
+          beforeTopEnd,
+          afterTop,
+          beforeBottom,
+          beforeBottomEnd,
+          afterBottom,
+          visiblePercent,
+          fromViewportCenter
         });
       }
     }
-  }, {
-    key: "onResize",
-    value: function onResize() {
+
+    onResize() {
       this.coverImage();
-      this.clipContainer();
     }
-  }]);
 
-  return Jarallax;
-}(); // global definition
+  } // global definition
 
 
-var plugin = function plugin(items, options) {
-  // check for dom element
-  // thanks: http://stackoverflow.com/questions/384286/javascript-isdom-how-do-you-check-if-a-javascript-object-is-a-dom-object
-  if ('object' === (typeof HTMLElement === "undefined" ? "undefined" : _typeof(HTMLElement)) ? items instanceof HTMLElement : items && 'object' === _typeof(items) && null !== items && 1 === items.nodeType && 'string' === typeof items.nodeName) {
-    items = [items];
-  }
+  const jarallax = function (items, options, ...args) {
+    // check for dom element
+    // thanks: http://stackoverflow.com/questions/384286/javascript-isdom-how-do-you-check-if-a-javascript-object-is-a-dom-object
+    if ('object' === typeof HTMLElement ? items instanceof HTMLElement : items && 'object' === typeof items && null !== items && 1 === items.nodeType && 'string' === typeof items.nodeName) {
+      items = [items];
+    }
 
-  var len = items.length;
-  var k = 0;
-  var ret;
+    const len = items.length;
+    let k = 0;
+    let ret;
 
-  for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
-    args[_key2 - 2] = arguments[_key2];
-  }
+    for (k; k < len; k += 1) {
+      if ('object' === typeof options || 'undefined' === typeof options) {
+        if (!items[k].jarallax) {
+          items[k].jarallax = new Jarallax(items[k], options);
+        }
+      } else if (items[k].jarallax) {
+        // eslint-disable-next-line prefer-spread
+        ret = items[k].jarallax[options].apply(items[k].jarallax, args);
+      }
 
-  for (k; k < len; k += 1) {
-    if ('object' === _typeof(options) || 'undefined' === typeof options) {
-      if (!items[k].jarallax) {
-        items[k].jarallax = new Jarallax(items[k], options);
+      if ('undefined' !== typeof ret) {
+        return ret;
       }
-    } else if (items[k].jarallax) {
-      // eslint-disable-next-line prefer-spread
-      ret = items[k].jarallax[options].apply(items[k].jarallax, args);
     }
 
-    if ('undefined' !== typeof ret) {
-      return ret;
-    }
-  }
+    return items;
+  };
+
+  jarallax.constructor = Jarallax;
+
+  const $ = global$1.jQuery; // jQuery support
 
-  return items;
-};
+  if ('undefined' !== typeof $) {
+    const $Plugin = function (...args) {
+      Array.prototype.unshift.call(args, this);
+      const res = jarallax.apply(global$1, args);
+      return 'object' !== typeof res ? res : this;
+    };
+
+    $Plugin.constructor = jarallax.constructor; // no conflict
+
+    const old$Plugin = $.fn.jarallax;
+    $.fn.jarallax = $Plugin;
+
+    $.fn.jarallax.noConflict = function () {
+      $.fn.jarallax = old$Plugin;
+      return this;
+    };
+  } // data-jarallax initialization
+
+
+  ready(() => {
+    jarallax(document.querySelectorAll('[data-jarallax]'));
+  });
 
-plugin.constructor = Jarallax;
-/* harmony default export */ __webpack_exports__["default"] = (plugin);
+  return jarallax;
 
-/***/ })
-/******/ ]);
\ No newline at end of file
+}));
+//# sourceMappingURL=jarallax.js.map
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.min.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.min.js
deleted file mode 100644
index 50fe026284b..00000000000
--- a/app/code/Magento/PageBuilder/view/base/web/js/resource/jarallax/jarallax.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Name    : Just Another Parallax [Jarallax]
- * Version : 1.12.5
- * Author  : nK <https://nkdev.info>
- * GitHub  : https://github.com/nk-o/jarallax
- */!function(n){var o={};function i(e){if(o[e])return o[e].exports;var t=o[e]={i:e,l:!1,exports:{}};return n[e].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=n,i.c=o,i.d=function(e,t,n){i.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(t,e){if(1&e&&(t=i(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var n=Object.create(null);if(i.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)i.d(n,o,function(e){return t[e]}.bind(null,o));return n},i.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(t,"a",t),t},i.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},i.p="",i(i.s=10)}([,,function(e,t){e.exports=function(e){"complete"===document.readyState||"interactive"===document.readyState?e.call():document.attachEvent?document.attachEvent("onreadystatechange",function(){"interactive"===document.readyState&&e.call()}):document.addEventListener&&document.addEventListener("DOMContentLoaded",e)}},function(n,e,t){(function(e){var t="undefined"!=typeof window?window:void 0!==e?e:"undefined"!=typeof self?self:{};n.exports=t}).call(this,t(4))},function(e,t){function n(e){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var o=function(){return this}();try{o=o||new Function("return this")()}catch(e){"object"===("undefined"==typeof window?"undefined":n(window))&&(o=window)}e.exports=o},,,,,,function(e,t,n){e.exports=n(11)},function(e,t,n){"use strict";n.r(t);var o=n(2),i=n.n(o),a=n(3),r=n(12);function l(e){return(l="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}var s,c,u=a.window.jarallax;a.window.jarallax=r.default,a.window.jarallax.noConflict=function(){return a.window.jarallax=u,this},void 0!==a.jQuery&&((s=function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++)t[n]=arguments[n];Array.prototype.unshift.call(t,this);var o=r.default.apply(a.window,t);return"object"!==l(o)?o:this}).constructor=r.default.constructor,c=a.jQuery.fn.jarallax,a.jQuery.fn.jarallax=s,a.jQuery.fn.jarallax.noConflict=function(){return a.jQuery.fn.jarallax=c,this}),i()(function(){Object(r.default)(document.querySelectorAll("[data-jarallax]"))})},function(e,t,n){"use strict";n.r(t);var o=n(2),i=n.n(o),b=n(3);function c(e,t){return function(e){if(Array.isArray(e))return e}(e)||function(e,t){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(e)))return;var n=[],o=!0,i=!1,a=void 0;try{for(var r,l=e[Symbol.iterator]();!(o=(r=l.next()).done)&&(n.push(r.value),!t||n.length!==t);o=!0);}catch(e){i=!0,a=e}finally{try{o||null==l.return||l.return()}finally{if(i)throw a}}return n}(e,t)||function(e,t){if(!e)return;if("string"==typeof e)return a(e,t);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return a(e,t)}(e,t)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function a(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,o=new Array(t);n<t;n++)o[n]=e[n];return o}function u(e){return(u="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function r(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}var l,h,p=b.window.navigator,d=-1<p.userAgent.indexOf("MSIE ")||-1<p.userAgent.indexOf("Trident/")||-1<p.userAgent.indexOf("Edge/"),s=/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(p.userAgent),m=function(){for(var e="transform WebkitTransform MozTransform".split(" "),t=document.createElement("div"),n=0;n<e.length;n+=1)if(t&&void 0!==t.style[e[n]])return e[n];return!1}();function f(){h=s?(!l&&document.body&&((l=document.createElement("div")).style.cssText="position: fixed; top: -9999px; left: 0; height: 100vh; width: 0;",document.body.appendChild(l)),(l?l.clientHeight:0)||b.window.innerHeight||document.documentElement.clientHeight):b.window.innerHeight||document.documentElement.clientHeight}f(),b.window.addEventListener("resize",f),b.window.addEventListener("orientationchange",f),b.window.addEventListener("load",f),i()(function(){f()});var g=[];function y(){g.length&&(g.forEach(function(e,t){var n=e.instance,o=e.oldData,i=n.$item.getBoundingClientRect(),a={width:i.width,height:i.height,top:i.top,bottom:i.bottom,wndW:b.window.innerWidth,wndH:h},r=!o||o.wndW!==a.wndW||o.wndH!==a.wndH||o.width!==a.width||o.height!==a.height,l=r||!o||o.top!==a.top||o.bottom!==a.bottom;g[t].oldData=a,r&&n.onResize(),l&&n.onScroll()}),b.window.requestAnimationFrame(y))}function v(e,t){("object"===("undefined"==typeof HTMLElement?"undefined":u(HTMLElement))?e instanceof HTMLElement:e&&"object"===u(e)&&null!==e&&1===e.nodeType&&"string"==typeof e.nodeName)&&(e=[e]);for(var n,o=e.length,i=0,a=arguments.length,r=new Array(2<a?a-2:0),l=2;l<a;l++)r[l-2]=arguments[l];for(;i<o;i+=1)if("object"===u(t)||void 0===t?e[i].jarallax||(e[i].jarallax=new w(e[i],t)):e[i].jarallax&&(n=e[i].jarallax[t].apply(e[i].jarallax,r)),void 0!==n)return n;return e}var x=0,w=function(){function s(e,t){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,s);var n=this;n.instanceID=x,x+=1,n.$item=e,n.defaults={type:"scroll",speed:.5,imgSrc:null,imgElement:".jarallax-img",imgSize:"cover",imgPosition:"50% 50%",imgRepeat:"no-repeat",keepImg:!1,elementInViewport:null,zIndex:-100,disableParallax:!1,disableVideo:!1,videoSrc:null,videoStartTime:0,videoEndTime:0,videoVolume:0,videoLoop:!0,videoPlayOnlyVisible:!0,videoLazyLoading:!0,onScroll:null,onInit:null,onDestroy:null,onCoverImage:null};var o,i,a=n.$item.dataset||{},r={};Object.keys(a).forEach(function(e){var t=e.substr(0,1).toLowerCase()+e.substr(1);t&&void 0!==n.defaults[t]&&(r[t]=a[e])}),n.options=n.extend({},n.defaults,r,t),n.pureOptions=n.extend({},n.options),Object.keys(n.options).forEach(function(e){"true"===n.options[e]?n.options[e]=!0:"false"===n.options[e]&&(n.options[e]=!1)}),n.options.speed=Math.min(2,Math.max(-1,parseFloat(n.options.speed))),"string"==typeof n.options.disableParallax&&(n.options.disableParallax=new RegExp(n.options.disableParallax)),n.options.disableParallax instanceof RegExp&&(o=n.options.disableParallax,n.options.disableParallax=function(){return o.test(p.userAgent)}),"function"!=typeof n.options.disableParallax&&(n.options.disableParallax=function(){return!1}),"string"==typeof n.options.disableVideo&&(n.options.disableVideo=new RegExp(n.options.disableVideo)),n.options.disableVideo instanceof RegExp&&(i=n.options.disableVideo,n.options.disableVideo=function(){return i.test(p.userAgent)}),"function"!=typeof n.options.disableVideo&&(n.options.disableVideo=function(){return!1});var l=n.options.elementInViewport;l&&"object"===u(l)&&void 0!==l.length&&(l=c(l,1)[0]),l instanceof Element||(l=null),n.options.elementInViewport=l,n.image={src:n.options.imgSrc||null,$container:null,useImgTag:!1,position:/iPad|iPhone|iPod|Android/.test(p.userAgent)?"absolute":"fixed"},n.initImg()&&n.canInitParallax()&&n.init()}var e,t,n;return e=s,(t=[{key:"css",value:function(t,n){return"string"==typeof n?b.window.getComputedStyle(t).getPropertyValue(n):(n.transform&&m&&(n[m]=n.transform),Object.keys(n).forEach(function(e){t.style[e]=n[e]}),t)}},{key:"extend",value:function(n){for(var e=arguments.length,o=new Array(1<e?e-1:0),t=1;t<e;t++)o[t-1]=arguments[t];return n=n||{},Object.keys(o).forEach(function(t){o[t]&&Object.keys(o[t]).forEach(function(e){n[e]=o[t][e]})}),n}},{key:"getWindowData",value:function(){return{width:b.window.innerWidth||document.documentElement.clientWidth,height:h,y:document.documentElement.scrollTop}}},{key:"initImg",value:function(){var e=this,t=e.options.imgElement;return t&&"string"==typeof t&&(t=e.$item.querySelector(t)),t instanceof Element||(e.options.imgSrc?(t=new Image).src=e.options.imgSrc:t=null),t&&(e.options.keepImg?e.image.$item=t.cloneNode(!0):(e.image.$item=t,e.image.$itemParent=t.parentNode),e.image.useImgTag=!0),!!e.image.$item||(null===e.image.src&&(e.image.src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",e.image.bgImage=e.css(e.$item,"background-image")),!(!e.image.bgImage||"none"===e.image.bgImage))}},{key:"canInitParallax",value:function(){return m&&!this.options.disableParallax()}},{key:"init",value:function(){var e,t,n,o=this,i={position:"absolute",top:0,left:0,width:"100%",height:"100%",overflow:"hidden"},a={pointerEvents:"none",transformStyle:"preserve-3d",backfaceVisibility:"hidden",willChange:"transform,opacity"};o.options.keepImg||((e=o.$item.getAttribute("style"))&&o.$item.setAttribute("data-jarallax-original-styles",e),!o.image.useImgTag||(t=o.image.$item.getAttribute("style"))&&o.image.$item.setAttribute("data-jarallax-original-styles",t)),"static"===o.css(o.$item,"position")&&o.css(o.$item,{position:"relative"}),"auto"===o.css(o.$item,"z-index")&&o.css(o.$item,{zIndex:0}),o.image.$container=document.createElement("div"),o.css(o.image.$container,i),o.css(o.image.$container,{"z-index":o.options.zIndex}),d&&o.css(o.image.$container,{opacity:.9999}),o.image.$container.setAttribute("id","jarallax-container-".concat(o.instanceID)),o.$item.appendChild(o.image.$container),o.image.useImgTag?a=o.extend({"object-fit":o.options.imgSize,"object-position":o.options.imgPosition,"font-family":"object-fit: ".concat(o.options.imgSize,"; object-position: ").concat(o.options.imgPosition,";"),"max-width":"none"},i,a):(o.image.$item=document.createElement("div"),o.image.src&&(a=o.extend({"background-position":o.options.imgPosition,"background-size":o.options.imgSize,"background-repeat":o.options.imgRepeat,"background-image":o.image.bgImage||'url("'.concat(o.image.src,'")')},i,a))),"opacity"!==o.options.type&&"scale"!==o.options.type&&"scale-opacity"!==o.options.type&&1!==o.options.speed||(o.image.position="absolute"),"fixed"===o.image.position&&(n=function(e){for(var t=[];null!==e.parentElement;)1===(e=e.parentElement).nodeType&&t.push(e);return t}(o.$item).filter(function(e){var t=b.window.getComputedStyle(e),n=t["-webkit-transform"]||t["-moz-transform"]||t.transform;return n&&"none"!==n||/(auto|scroll)/.test(t.overflow+t["overflow-y"]+t["overflow-x"])}),o.image.position=n.length?"absolute":"fixed"),a.position=o.image.position,o.css(o.image.$item,a),o.image.$container.appendChild(o.image.$item),o.onResize(),o.onScroll(!0),o.options.onInit&&o.options.onInit.call(o),"none"!==o.css(o.$item,"background-image")&&o.css(o.$item,{"background-image":"none"}),o.addToParallaxList()}},{key:"addToParallaxList",value:function(){g.push({instance:this}),1===g.length&&b.window.requestAnimationFrame(y)}},{key:"removeFromParallaxList",value:function(){var n=this;g.forEach(function(e,t){e.instance.instanceID===n.instanceID&&g.splice(t,1)})}},{key:"destroy",value:function(){var e=this;e.removeFromParallaxList();var t,n=e.$item.getAttribute("data-jarallax-original-styles");e.$item.removeAttribute("data-jarallax-original-styles"),n?e.$item.setAttribute("style",n):e.$item.removeAttribute("style"),e.image.useImgTag&&(t=e.image.$item.getAttribute("data-jarallax-original-styles"),e.image.$item.removeAttribute("data-jarallax-original-styles"),t?e.image.$item.setAttribute("style",n):e.image.$item.removeAttribute("style"),e.image.$itemParent&&e.image.$itemParent.appendChild(e.image.$item)),e.$clipStyles&&e.$clipStyles.parentNode.removeChild(e.$clipStyles),e.image.$container&&e.image.$container.parentNode.removeChild(e.image.$container),e.options.onDestroy&&e.options.onDestroy.call(e),delete e.$item.jarallax}},{key:"clipContainer",value:function(){var e,t,n,o,i;"fixed"===this.image.position&&(n=(t=(e=this).image.$container.getBoundingClientRect()).width,o=t.height,e.$clipStyles||(e.$clipStyles=document.createElement("style"),e.$clipStyles.setAttribute("type","text/css"),e.$clipStyles.setAttribute("id","jarallax-clip-".concat(e.instanceID)),(document.head||document.getElementsByTagName("head")[0]).appendChild(e.$clipStyles)),i="#jarallax-container-".concat(e.instanceID," {\n            clip: rect(0 ").concat(n,"px ").concat(o,"px 0);\n            clip: rect(0, ").concat(n,"px, ").concat(o,"px, 0);\n            -webkit-clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);\n            clip-path: polygon(0 0, 100% 0, 100% 100%, 0 100%);\n        }"),e.$clipStyles.styleSheet?e.$clipStyles.styleSheet.cssText=i:e.$clipStyles.innerHTML=i)}},{key:"coverImage",value:function(){var e=this,t=e.image.$container.getBoundingClientRect(),n=t.height,o=e.options.speed,i="scroll"===e.options.type||"scroll-opacity"===e.options.type,a=0,r=n,l=0;return i&&(o<0?(a=o*Math.max(n,h),h<n&&(a-=o*(n-h))):a=o*(n+h),1<o?r=Math.abs(a-h):o<0?r=a/o+Math.abs(a):r+=(h-n)*(1-o),a/=2),e.parallaxScrollDistance=a,l=i?(h-r)/2:(n-r)/2,e.css(e.image.$item,{height:"".concat(r,"px"),marginTop:"".concat(l,"px"),left:"fixed"===e.image.position?"".concat(t.left,"px"):"0",width:"".concat(t.width,"px")}),e.options.onCoverImage&&e.options.onCoverImage.call(e),{image:{height:r,marginTop:l},container:t}}},{key:"isVisible",value:function(){return this.isElementInViewport||!1}},{key:"onScroll",value:function(e){var t,n,o,i,a,r,l,s,c,u,p=this,d=p.$item.getBoundingClientRect(),m=d.top,f=d.height,g={},y=d;p.options.elementInViewport&&(y=p.options.elementInViewport.getBoundingClientRect()),p.isElementInViewport=0<=y.bottom&&0<=y.right&&y.top<=h&&y.left<=b.window.innerWidth,(e||p.isElementInViewport)&&(t=Math.max(0,m),n=Math.max(0,f+m),o=Math.max(0,-m),i=Math.max(0,m+f-h),a=Math.max(0,f-(m+f-h)),r=Math.max(0,-m+h-f),l=1-(h-m)/(h+f)*2,s=1,f<h?s=1-(o||i)/f:n<=h?s=n/h:a<=h&&(s=a/h),"opacity"!==p.options.type&&"scale-opacity"!==p.options.type&&"scroll-opacity"!==p.options.type||(g.transform="translate3d(0,0,0)",g.opacity=s),"scale"!==p.options.type&&"scale-opacity"!==p.options.type||(c=1,p.options.speed<0?c-=p.options.speed*s:c+=p.options.speed*(1-s),g.transform="scale(".concat(c,") translate3d(0,0,0)")),"scroll"!==p.options.type&&"scroll-opacity"!==p.options.type||(u=p.parallaxScrollDistance*l,"absolute"===p.image.position&&(u-=m),g.transform="translate3d(0,".concat(u,"px,0)")),p.css(p.image.$item,g),p.options.onScroll&&p.options.onScroll.call(p,{section:d,beforeTop:t,beforeTopEnd:n,afterTop:o,beforeBottom:i,beforeBottomEnd:a,afterBottom:r,visiblePercent:s,fromViewportCenter:l}))}},{key:"onResize",value:function(){this.coverImage(),this.clipContainer()}}])&&r(e.prototype,t),n&&r(e,n),s}();v.constructor=w,t.default=v}]);
-//# sourceMappingURL=jarallax.min.js.map
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.js
index 17935b02786..6cbcbb4f198 100644
--- a/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.js
+++ b/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.js
@@ -6,7 +6,7 @@
 |___/_|_|\___|_|\_(_)/ |___/
                    |__/
 
- Version: 1.8.1
+ Version: 1.9.0
   Author: Ken Wheeler
  Website: http://kenwheeler.github.io
     Docs: http://kenwheeler.github.io/slick
@@ -1033,18 +1033,18 @@
                     }, 0);
                 }
             ).on(
-            'blur.slick',
-            '*',
-            function(event) {
-                var $sf = $(this);
-
-                // When a blur occurs on any elements within the slider we become unfocused
-                if( _.options.pauseOnFocus ) {
-                    _.focussed = false;
-                    _.autoPlay();
+                'blur.slick',
+                '*',
+                function(event) {
+                    var $sf = $(this);
+
+                    // When a blur occurs on any elements within the slider we become unfocused
+                    if( _.options.pauseOnFocus ) {
+                        _.focussed = false;
+                        _.autoPlay();
+                    }
                 }
-            }
-        );
+            );
     };
 
     Slick.prototype.getCurrent = Slick.prototype.slickCurrentSlide = function() {
@@ -1064,7 +1064,7 @@
 
         if (_.options.infinite === true) {
             if (_.slideCount <= _.options.slidesToShow) {
-                ++pagerQty;
+                 ++pagerQty;
             } else {
                 while (breakPoint < _.slideCount) {
                     ++pagerQty;
@@ -1238,13 +1238,25 @@
     Slick.prototype.getSlideCount = function() {
 
         var _ = this,
-            slidesTraversed, swipedSlide, centerOffset;
+            slidesTraversed, swipedSlide, swipeTarget, centerOffset;
 
-        centerOffset = _.options.centerMode === true ? _.slideWidth * Math.floor(_.options.slidesToShow / 2) : 0;
+        centerOffset = _.options.centerMode === true ? Math.floor(_.$list.width() / 2) : 0;
+        swipeTarget = (_.swipeLeft * -1) + centerOffset;
 
         if (_.options.swipeToSlide === true) {
+
             _.$slideTrack.find('.slick-slide').each(function(index, slide) {
-                if (slide.offsetLeft - centerOffset + ($(slide).outerWidth() / 2) > (_.swipeLeft * -1)) {
+
+                var slideOuterWidth, slideOffset, slideRightBoundary;
+                slideOuterWidth = $(slide).outerWidth();
+                slideOffset = slide.offsetLeft;
+                if (_.options.centerMode !== true) {
+                    slideOffset += (slideOuterWidth / 2);
+                }
+
+                slideRightBoundary = slideOffset + (slideOuterWidth);
+
+                if (swipeTarget < slideRightBoundary) {
                     swipedSlide = slide;
                     return false;
                 }
@@ -1313,10 +1325,10 @@
 
     Slick.prototype.initADA = function() {
         var _ = this,
-            numDotGroups = Math.ceil(_.slideCount / _.options.slidesToShow),
-            tabControlIndexes = _.getNavigableIndexes().filter(function(val) {
-                return (val >= 0) && (val < _.slideCount);
-            });
+                numDotGroups = Math.ceil(_.slideCount / _.options.slidesToShow),
+                tabControlIndexes = _.getNavigableIndexes().filter(function(val) {
+                    return (val >= 0) && (val < _.slideCount);
+                });
 
         _.$slides.add(_.$slideTrack.find('.slick-cloned')).attr({
             'aria-hidden': 'true',
@@ -1336,12 +1348,12 @@
                 });
 
                 if (slideControlIndex !== -1) {
-                    var ariaButtonControl = 'slick-slide-control' + _.instanceUid + slideControlIndex
-                    if ($('#' + ariaButtonControl).length) {
-                        $(this).attr({
-                            'aria-describedby': ariaButtonControl
-                        });
-                    }
+                   var ariaButtonControl = 'slick-slide-control' + _.instanceUid + slideControlIndex
+                   if ($('#' + ariaButtonControl).length) {
+                     $(this).attr({
+                         'aria-describedby': ariaButtonControl
+                     });
+                   }
                 }
             });
 
@@ -1368,11 +1380,11 @@
         }
 
         for (var i=_.currentSlide, max=i+_.options.slidesToShow; i < max; i++) {
-            if (_.options.focusOnChange) {
-                _.$slides.eq(i).attr({'tabindex': '0'});
-            } else {
-                _.$slides.eq(i).removeAttr('tabindex');
-            }
+          if (_.options.focusOnChange) {
+            _.$slides.eq(i).attr({'tabindex': '0'});
+          } else {
+            _.$slides.eq(i).removeAttr('tabindex');
+          }
         }
 
         _.activateADA();
@@ -1385,15 +1397,15 @@
 
         if (_.options.arrows === true && _.slideCount > _.options.slidesToShow) {
             _.$prevArrow
-                .off('click.slick')
-                .on('click.slick', {
+               .off('click.slick')
+               .on('click.slick', {
                     message: 'previous'
-                }, _.changeSlide);
+               }, _.changeSlide);
             _.$nextArrow
-                .off('click.slick')
-                .on('click.slick', {
+               .off('click.slick')
+               .on('click.slick', {
                     message: 'next'
-                }, _.changeSlide);
+               }, _.changeSlide);
 
             if (_.options.accessibility === true) {
                 _.$prevArrow.on('keydown.slick', _.keyHandler);
@@ -1507,7 +1519,7 @@
     Slick.prototype.keyHandler = function(event) {
 
         var _ = this;
-        //Dont slide if the cursor is inside the form fields and arrow keys are pressed
+         //Dont slide if the cursor is inside the form fields and arrow keys are pressed
         if(!event.target.tagName.match('TEXTAREA|INPUT|SELECT')) {
             if (event.keyCode === 37 && _.options.accessibility === true) {
                 _.changeSlide({
@@ -2122,102 +2134,102 @@
     };
 
     Slick.prototype.setOption =
-        Slick.prototype.slickSetOption = function() {
+    Slick.prototype.slickSetOption = function() {
 
-            /**
-             * accepts arguments in format of:
-             *
-             *  - for changing a single option's value:
-             *     .slick("setOption", option, value, refresh )
-             *
-             *  - for changing a set of responsive options:
-             *     .slick("setOption", 'responsive', [{}, ...], refresh )
-             *
-             *  - for updating multiple values at once (not responsive)
-             *     .slick("setOption", { 'option': value, ... }, refresh )
-             */
+        /**
+         * accepts arguments in format of:
+         *
+         *  - for changing a single option's value:
+         *     .slick("setOption", option, value, refresh )
+         *
+         *  - for changing a set of responsive options:
+         *     .slick("setOption", 'responsive', [{}, ...], refresh )
+         *
+         *  - for updating multiple values at once (not responsive)
+         *     .slick("setOption", { 'option': value, ... }, refresh )
+         */
 
-            var _ = this, l, item, option, value, refresh = false, type;
+        var _ = this, l, item, option, value, refresh = false, type;
 
-            if( $.type( arguments[0] ) === 'object' ) {
+        if( $.type( arguments[0] ) === 'object' ) {
 
-                option =  arguments[0];
-                refresh = arguments[1];
-                type = 'multiple';
+            option =  arguments[0];
+            refresh = arguments[1];
+            type = 'multiple';
 
-            } else if ( $.type( arguments[0] ) === 'string' ) {
+        } else if ( $.type( arguments[0] ) === 'string' ) {
 
-                option =  arguments[0];
-                value = arguments[1];
-                refresh = arguments[2];
+            option =  arguments[0];
+            value = arguments[1];
+            refresh = arguments[2];
 
-                if ( arguments[0] === 'responsive' && $.type( arguments[1] ) === 'array' ) {
+            if ( arguments[0] === 'responsive' && $.type( arguments[1] ) === 'array' ) {
 
-                    type = 'responsive';
+                type = 'responsive';
 
-                } else if ( typeof arguments[1] !== 'undefined' ) {
+            } else if ( typeof arguments[1] !== 'undefined' ) {
 
-                    type = 'single';
-
-                }
+                type = 'single';
 
             }
 
-            if ( type === 'single' ) {
-
-                _.options[option] = value;
+        }
 
+        if ( type === 'single' ) {
 
-            } else if ( type === 'multiple' ) {
+            _.options[option] = value;
 
-                $.each( option , function( opt, val ) {
 
-                    _.options[opt] = val;
+        } else if ( type === 'multiple' ) {
 
-                });
+            $.each( option , function( opt, val ) {
 
+                _.options[opt] = val;
 
-            } else if ( type === 'responsive' ) {
+            });
 
-                for ( item in value ) {
 
-                    if( $.type( _.options.responsive ) !== 'array' ) {
+        } else if ( type === 'responsive' ) {
 
-                        _.options.responsive = [ value[item] ];
+            for ( item in value ) {
 
-                    } else {
+                if( $.type( _.options.responsive ) !== 'array' ) {
 
-                        l = _.options.responsive.length-1;
+                    _.options.responsive = [ value[item] ];
 
-                        // loop through the responsive object and splice out duplicates.
-                        while( l >= 0 ) {
+                } else {
 
-                            if( _.options.responsive[l].breakpoint === value[item].breakpoint ) {
+                    l = _.options.responsive.length-1;
 
-                                _.options.responsive.splice(l,1);
+                    // loop through the responsive object and splice out duplicates.
+                    while( l >= 0 ) {
 
-                            }
+                        if( _.options.responsive[l].breakpoint === value[item].breakpoint ) {
 
-                            l--;
+                            _.options.responsive.splice(l,1);
 
                         }
 
-                        _.options.responsive.push( value[item] );
+                        l--;
 
                     }
 
+                    _.options.responsive.push( value[item] );
+
                 }
 
             }
 
-            if ( refresh ) {
+        }
 
-                _.unload();
-                _.reinit();
+        if ( refresh ) {
 
-            }
+            _.unload();
+            _.reinit();
+
+        }
 
-        };
+    };
 
     Slick.prototype.setPosition = function() {
 
@@ -2426,7 +2438,7 @@
                 }
 
                 for (i = _.slideCount; i > (_.slideCount -
-                    infiniteCount); i -= 1) {
+                        infiniteCount); i -= 1) {
                     slideIndex = i - 1;
                     $(_.$slides[slideIndex]).clone(true).attr('id', '')
                         .attr('data-slick-index', slideIndex - _.slideCount)
@@ -2973,8 +2985,8 @@
 
             _.$dots
                 .find('li')
-                .removeClass('slick-active')
-                .end();
+                    .removeClass('slick-active')
+                    .end();
 
             _.$dots
                 .find('li')
diff --git a/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.min.js b/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.min.js
index 91a919b3fd4..5104503d8f4 100755
--- a/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.min.js
+++ b/app/code/Magento/PageBuilder/view/base/web/js/resource/slick/slick.min.js
@@ -6,7 +6,7 @@
 |___/_|_|\___|_|\_(_)/ |___/
                    |__/
 
- Version: 1.8.1
+ Version: 1.9.0
   Author: Ken Wheeler
  Website: http://kenwheeler.github.io
     Docs: http://kenwheeler.github.io/slick
@@ -14,4 +14,5 @@
   Issues: http://github.com/kenwheeler/slick/issues
 
  */
-!function(i){"use strict";"function"==typeof define&&define.amd?define(["jquery"],i):"undefined"!=typeof exports?module.exports=i(require("jquery")):i(jQuery)}(function(i){"use strict";var e=window.Slick||{};(e=function(){var e=0;return function(t,o){var s,n=this;n.defaults={accessibility:!0,adaptiveHeight:!1,appendArrows:i(t),appendDots:i(t),arrows:!0,asNavFor:null,prevArrow:'<button class="slick-prev" aria-label="Previous" type="button">Previous</button>',nextArrow:'<button class="slick-next" aria-label="Next" type="button">Next</button>',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i('<button type="button" />').text(t+1)},dots:!1,dotsClass:"slick-dots",draggable:!0,easing:"linear",edgeFriction:.35,fade:!1,focusOnSelect:!1,focusOnChange:!1,infinite:!0,initialSlide:0,lazyLoad:"ondemand",mobileFirst:!1,pauseOnHover:!0,pauseOnFocus:!0,pauseOnDotsHover:!1,respondTo:"window",responsive:null,rows:1,rtl:!1,slide:"",slidesPerRow:1,slidesToShow:1,slidesToScroll:1,speed:500,swipe:!0,swipeToSlide:!1,touchMove:!0,touchThreshold:5,useCSS:!0,useTransform:!0,variableWidth:!1,vertical:!1,verticalSwiping:!1,waitForAnimate:!0,zIndex:1e3},n.initials={animating:!1,dragging:!1,autoPlayTimer:null,currentDirection:0,currentLeft:null,currentSlide:0,direction:1,$dots:null,listWidth:null,listHeight:null,loadIndex:0,$nextArrow:null,$prevArrow:null,scrolling:!1,slideCount:null,slideWidth:null,$slideTrack:null,$slides:null,sliding:!1,slideOffset:0,swipeLeft:null,swiping:!1,$list:null,touchObject:{},transformsEnabled:!1,unslicked:!1},i.extend(n,n.initials),n.activeBreakpoint=null,n.animType=null,n.animProp=null,n.breakpoints=[],n.breakpointSettings=[],n.cssTransitions=!1,n.focussed=!1,n.interrupted=!1,n.hidden="hidden",n.paused=!0,n.positionProp=null,n.respondTo=null,n.rowCount=1,n.shouldClick=!0,n.$slider=i(t),n.$slidesCache=null,n.transformType=null,n.transitionType=null,n.visibilityChange="visibilitychange",n.windowWidth=0,n.windowTimer=null,s=i(t).data("slick")||{},n.options=i.extend({},n.defaults,o,s),n.currentSlide=n.options.initialSlide,n.originalSettings=n.options,void 0!==document.mozHidden?(n.hidden="mozHidden",n.visibilityChange="mozvisibilitychange"):void 0!==document.webkitHidden&&(n.hidden="webkitHidden",n.visibilityChange="webkitvisibilitychange"),n.autoPlay=i.proxy(n.autoPlay,n),n.autoPlayClear=i.proxy(n.autoPlayClear,n),n.autoPlayIterator=i.proxy(n.autoPlayIterator,n),n.changeSlide=i.proxy(n.changeSlide,n),n.clickHandler=i.proxy(n.clickHandler,n),n.selectHandler=i.proxy(n.selectHandler,n),n.setPosition=i.proxy(n.setPosition,n),n.swipeHandler=i.proxy(n.swipeHandler,n),n.dragHandler=i.proxy(n.dragHandler,n),n.keyHandler=i.proxy(n.keyHandler,n),n.instanceUid=e++,n.htmlExpr=/^(?:\s*(<[\w\W]+>)[^>]*)$/,n.registerBreakpoints(),n.init(!0)}}()).prototype.activateADA=function(){this.$slideTrack.find(".slick-active").attr({"aria-hidden":"false"}).find("a, input, button, select").attr({tabindex:"0"})},e.prototype.addSlide=e.prototype.slickAdd=function(e,t,o){var s=this;if("boolean"==typeof t)o=t,t=null;else if(t<0||t>=s.slideCount)return!1;s.unload(),"number"==typeof t?0===t&&0===s.$slides.length?i(e).appendTo(s.$slideTrack):o?i(e).insertBefore(s.$slides.eq(t)):i(e).insertAfter(s.$slides.eq(t)):!0===o?i(e).prependTo(s.$slideTrack):i(e).appendTo(s.$slideTrack),s.$slides=s.$slideTrack.children(this.options.slide),s.$slideTrack.children(this.options.slide).detach(),s.$slideTrack.append(s.$slides),s.$slides.each(function(e,t){i(t).attr("data-slick-index",e)}),s.$slidesCache=s.$slides,s.reinit()},e.prototype.animateHeight=function(){var i=this;if(1===i.options.slidesToShow&&!0===i.options.adaptiveHeight&&!1===i.options.vertical){var e=i.$slides.eq(i.currentSlide).outerHeight(!0);i.$list.animate({height:e},i.options.speed)}},e.prototype.animateSlide=function(e,t){var o={},s=this;s.animateHeight(),!0===s.options.rtl&&!1===s.options.vertical&&(e=-e),!1===s.transformsEnabled?!1===s.options.vertical?s.$slideTrack.animate({left:e},s.options.speed,s.options.easing,t):s.$slideTrack.animate({top:e},s.options.speed,s.options.easing,t):!1===s.cssTransitions?(!0===s.options.rtl&&(s.currentLeft=-s.currentLeft),i({animStart:s.currentLeft}).animate({animStart:e},{duration:s.options.speed,easing:s.options.easing,step:function(i){i=Math.ceil(i),!1===s.options.vertical?(o[s.animType]="translate("+i+"px, 0px)",s.$slideTrack.css(o)):(o[s.animType]="translate(0px,"+i+"px)",s.$slideTrack.css(o))},complete:function(){t&&t.call()}})):(s.applyTransition(),e=Math.ceil(e),!1===s.options.vertical?o[s.animType]="translate3d("+e+"px, 0px, 0px)":o[s.animType]="translate3d(0px,"+e+"px, 0px)",s.$slideTrack.css(o),t&&setTimeout(function(){s.disableTransition(),t.call()},s.options.speed))},e.prototype.getNavTarget=function(){var e=this.options.asNavFor;return e&&null!==e&&(e=i(e).not(this.$slider)),e},e.prototype.asNavFor=function(e){var t=this.getNavTarget();null!==t&&"object"==typeof t&&t.each(function(){var t=i(this).slick("getSlick");t.unslicked||t.slideHandler(e,!0)})},e.prototype.applyTransition=function(i){var e=this,t={};!1===e.options.fade?t[e.transitionType]=e.transformType+" "+e.options.speed+"ms "+e.options.cssEase:t[e.transitionType]="opacity "+e.options.speed+"ms "+e.options.cssEase,!1===e.options.fade?e.$slideTrack.css(t):e.$slides.eq(i).css(t)},e.prototype.autoPlay=function(){var i=this;i.autoPlayClear(),i.slideCount>i.options.slidesToShow&&(i.autoPlayTimer=setInterval(i.autoPlayIterator,i.options.autoplaySpeed))},e.prototype.autoPlayClear=function(){this.autoPlayTimer&&clearInterval(this.autoPlayTimer)},e.prototype.autoPlayIterator=function(){var i=this,e=i.currentSlide+i.options.slidesToScroll;i.paused||i.interrupted||i.focussed||(!1===i.options.infinite&&(1===i.direction&&i.currentSlide+1===i.slideCount-1?i.direction=0:0===i.direction&&(e=i.currentSlide-i.options.slidesToScroll,i.currentSlide-1==0&&(i.direction=1))),i.slideHandler(e))},e.prototype.buildArrows=function(){var e=this;!0===e.options.arrows&&(e.$prevArrow=i(e.options.prevArrow).addClass("slick-arrow"),e.$nextArrow=i(e.options.nextArrow).addClass("slick-arrow"),e.slideCount>e.options.slidesToShow?(e.$prevArrow.removeClass("slick-hidden").removeAttr("aria-hidden tabindex"),e.$nextArrow.removeClass("slick-hidden").removeAttr("aria-hidden tabindex"),e.htmlExpr.test(e.options.prevArrow)&&e.$prevArrow.prependTo(e.options.appendArrows),e.htmlExpr.test(e.options.nextArrow)&&e.$nextArrow.appendTo(e.options.appendArrows),!0!==e.options.infinite&&e.$prevArrow.addClass("slick-disabled").attr("aria-disabled","true")):e.$prevArrow.add(e.$nextArrow).addClass("slick-hidden").attr({"aria-disabled":"true",tabindex:"-1"}))},e.prototype.buildDots=function(){var e,t,o=this;if(!0===o.options.dots&&o.slideCount>o.options.slidesToShow){for(o.$slider.addClass("slick-dotted"),t=i("<ul />").addClass(o.options.dotsClass),e=0;e<=o.getDotCount();e+=1)t.append(i("<li />").append(o.options.customPaging.call(this,o,e)));o.$dots=t.appendTo(o.options.appendDots),o.$dots.find("li").first().addClass("slick-active")}},e.prototype.buildOut=function(){var e=this;e.$slides=e.$slider.children(e.options.slide+":not(.slick-cloned)").addClass("slick-slide"),e.slideCount=e.$slides.length,e.$slides.each(function(e,t){i(t).attr("data-slick-index",e).data("originalStyling",i(t).attr("style")||"")}),e.$slider.addClass("slick-slider"),e.$slideTrack=0===e.slideCount?i('<div class="slick-track"/>').appendTo(e.$slider):e.$slides.wrapAll('<div class="slick-track"/>').parent(),e.$list=e.$slideTrack.wrap('<div class="slick-list"/>').parent(),e.$slideTrack.css("opacity",0),!0!==e.options.centerMode&&!0!==e.options.swipeToSlide||(e.options.slidesToScroll=1),i("img[data-lazy]",e.$slider).not("[src]").addClass("slick-loading"),e.setupInfinite(),e.buildArrows(),e.buildDots(),e.updateDots(),e.setSlideClasses("number"==typeof e.currentSlide?e.currentSlide:0),!0===e.options.draggable&&e.$list.addClass("draggable")},e.prototype.buildRows=function(){var i,e,t,o,s,n,r,l=this;if(o=document.createDocumentFragment(),n=l.$slider.children(),l.options.rows>0){for(r=l.options.slidesPerRow*l.options.rows,s=Math.ceil(n.length/r),i=0;i<s;i++){var d=document.createElement("div");for(e=0;e<l.options.rows;e++){var a=document.createElement("div");for(t=0;t<l.options.slidesPerRow;t++){var c=i*r+(e*l.options.slidesPerRow+t);n.get(c)&&a.appendChild(n.get(c))}d.appendChild(a)}o.appendChild(d)}l.$slider.empty().append(o),l.$slider.children().children().children().css({width:100/l.options.slidesPerRow+"%",display:"inline-block"})}},e.prototype.checkResponsive=function(e,t){var o,s,n,r=this,l=!1,d=r.$slider.width(),a=window.innerWidth||i(window).width();if("window"===r.respondTo?n=a:"slider"===r.respondTo?n=d:"min"===r.respondTo&&(n=Math.min(a,d)),r.options.responsive&&r.options.responsive.length&&null!==r.options.responsive){s=null;for(o in r.breakpoints)r.breakpoints.hasOwnProperty(o)&&(!1===r.originalSettings.mobileFirst?n<r.breakpoints[o]&&(s=r.breakpoints[o]):n>r.breakpoints[o]&&(s=r.breakpoints[o]));null!==s?null!==r.activeBreakpoint?(s!==r.activeBreakpoint||t)&&(r.activeBreakpoint=s,"unslick"===r.breakpointSettings[s]?r.unslick(s):(r.options=i.extend({},r.originalSettings,r.breakpointSettings[s]),!0===e&&(r.currentSlide=r.options.initialSlide),r.refresh(e)),l=s):(r.activeBreakpoint=s,"unslick"===r.breakpointSettings[s]?r.unslick(s):(r.options=i.extend({},r.originalSettings,r.breakpointSettings[s]),!0===e&&(r.currentSlide=r.options.initialSlide),r.refresh(e)),l=s):null!==r.activeBreakpoint&&(r.activeBreakpoint=null,r.options=r.originalSettings,!0===e&&(r.currentSlide=r.options.initialSlide),r.refresh(e),l=s),e||!1===l||r.$slider.trigger("breakpoint",[r,l])}},e.prototype.changeSlide=function(e,t){var o,s,n=this,r=i(e.currentTarget);switch(r.is("a")&&e.preventDefault(),r.is("li")||(r=r.closest("li")),o=n.slideCount%n.options.slidesToScroll!=0?0:(n.slideCount-n.currentSlide)%n.options.slidesToScroll,e.data.message){case"previous":s=0===o?n.options.slidesToScroll:n.options.slidesToShow-o,n.slideCount>n.options.slidesToShow&&n.slideHandler(n.currentSlide-s,!1,t);break;case"next":s=0===o?n.options.slidesToScroll:o,n.slideCount>n.options.slidesToShow&&n.slideHandler(n.currentSlide+s,!1,t);break;case"index":var l=0===e.data.index?0:e.data.index||r.index()*n.options.slidesToScroll;n.slideHandler(n.checkNavigable(l),!1,t),r.children().trigger("focus");break;default:return}},e.prototype.checkNavigable=function(i){var e,t;if(t=0,i>(e=this.getNavigableIndexes())[e.length-1])i=e[e.length-1];else for(var o in e){if(i<e[o]){i=t;break}t=e[o]}return i},e.prototype.cleanUpEvents=function(){var e=this;e.options.dots&&null!==e.$dots&&(i("li",e.$dots).off("click.slick",e.changeSlide).off("mouseenter.slick",i.proxy(e.interrupt,e,!0)).off("mouseleave.slick",i.proxy(e.interrupt,e,!1)),!0===e.options.accessibility&&e.$dots.off("keydown.slick",e.keyHandler)),e.$slider.off("focus.slick blur.slick"),!0===e.options.arrows&&e.slideCount>e.options.slidesToShow&&(e.$prevArrow&&e.$prevArrow.off("click.slick",e.changeSlide),e.$nextArrow&&e.$nextArrow.off("click.slick",e.changeSlide),!0===e.options.accessibility&&(e.$prevArrow&&e.$prevArrow.off("keydown.slick",e.keyHandler),e.$nextArrow&&e.$nextArrow.off("keydown.slick",e.keyHandler))),e.$list.off("touchstart.slick mousedown.slick",e.swipeHandler),e.$list.off("touchmove.slick mousemove.slick",e.swipeHandler),e.$list.off("touchend.slick mouseup.slick",e.swipeHandler),e.$list.off("touchcancel.slick mouseleave.slick",e.swipeHandler),e.$list.off("click.slick",e.clickHandler),i(document).off(e.visibilityChange,e.visibility),e.cleanUpSlideEvents(),!0===e.options.accessibility&&e.$list.off("keydown.slick",e.keyHandler),!0===e.options.focusOnSelect&&i(e.$slideTrack).children().off("click.slick",e.selectHandler),i(window).off("orientationchange.slick.slick-"+e.instanceUid,e.orientationChange),i(window).off("resize.slick.slick-"+e.instanceUid,e.resize),i("[draggable!=true]",e.$slideTrack).off("dragstart",e.preventDefault),i(window).off("load.slick.slick-"+e.instanceUid,e.setPosition)},e.prototype.cleanUpSlideEvents=function(){var e=this;e.$list.off("mouseenter.slick",i.proxy(e.interrupt,e,!0)),e.$list.off("mouseleave.slick",i.proxy(e.interrupt,e,!1))},e.prototype.cleanUpRows=function(){var i;this.options.rows>0&&((i=this.$slides.children().children()).removeAttr("style"),this.$slider.empty().append(i))},e.prototype.clickHandler=function(i){!1===this.shouldClick&&(i.stopImmediatePropagation(),i.stopPropagation(),i.preventDefault())},e.prototype.destroy=function(e){var t=this;t.autoPlayClear(),t.touchObject={},t.cleanUpEvents(),i(".slick-cloned",t.$slider).detach(),t.$dots&&t.$dots.remove(),t.$prevArrow&&t.$prevArrow.length&&(t.$prevArrow.removeClass("slick-disabled slick-arrow slick-hidden").removeAttr("aria-hidden aria-disabled tabindex").css("display",""),t.htmlExpr.test(t.options.prevArrow)&&t.$prevArrow.remove()),t.$nextArrow&&t.$nextArrow.length&&(t.$nextArrow.removeClass("slick-disabled slick-arrow slick-hidden").removeAttr("aria-hidden aria-disabled tabindex").css("display",""),t.htmlExpr.test(t.options.nextArrow)&&t.$nextArrow.remove()),t.$slides&&(t.$slides.removeClass("slick-slide slick-active slick-center slick-visible slick-current").removeAttr("aria-hidden").removeAttr("data-slick-index").each(function(){i(this).attr("style",i(this).data("originalStyling"))}),t.$slideTrack.children(this.options.slide).detach(),t.$slideTrack.detach(),t.$list.detach(),t.$slider.append(t.$slides)),t.cleanUpRows(),t.$slider.removeClass("slick-slider"),t.$slider.removeClass("slick-initialized"),t.$slider.removeClass("slick-dotted"),t.unslicked=!0,e||t.$slider.trigger("destroy",[t])},e.prototype.disableTransition=function(i){var e={};e[this.transitionType]="",!1===this.options.fade?this.$slideTrack.css(e):this.$slides.eq(i).css(e)},e.prototype.fadeSlide=function(i,e){var t=this;!1===t.cssTransitions?(t.$slides.eq(i).css({zIndex:t.options.zIndex}),t.$slides.eq(i).animate({opacity:1},t.options.speed,t.options.easing,e)):(t.applyTransition(i),t.$slides.eq(i).css({opacity:1,zIndex:t.options.zIndex}),e&&setTimeout(function(){t.disableTransition(i),e.call()},t.options.speed))},e.prototype.fadeSlideOut=function(i){var e=this;!1===e.cssTransitions?e.$slides.eq(i).animate({opacity:0,zIndex:e.options.zIndex-2},e.options.speed,e.options.easing):(e.applyTransition(i),e.$slides.eq(i).css({opacity:0,zIndex:e.options.zIndex-2}))},e.prototype.filterSlides=e.prototype.slickFilter=function(i){var e=this;null!==i&&(e.$slidesCache=e.$slides,e.unload(),e.$slideTrack.children(this.options.slide).detach(),e.$slidesCache.filter(i).appendTo(e.$slideTrack),e.reinit())},e.prototype.focusHandler=function(){var e=this;e.$slider.off("focus.slick blur.slick").on("focus.slick","*",function(t){var o=i(this);setTimeout(function(){e.options.pauseOnFocus&&o.is(":focus")&&(e.focussed=!0,e.autoPlay())},0)}).on("blur.slick","*",function(t){i(this);e.options.pauseOnFocus&&(e.focussed=!1,e.autoPlay())})},e.prototype.getCurrent=e.prototype.slickCurrentSlide=function(){return this.currentSlide},e.prototype.getDotCount=function(){var i=this,e=0,t=0,o=0;if(!0===i.options.infinite)if(i.slideCount<=i.options.slidesToShow)++o;else for(;e<i.slideCount;)++o,e=t+i.options.slidesToScroll,t+=i.options.slidesToScroll<=i.options.slidesToShow?i.options.slidesToScroll:i.options.slidesToShow;else if(!0===i.options.centerMode)o=i.slideCount;else if(i.options.asNavFor)for(;e<i.slideCount;)++o,e=t+i.options.slidesToScroll,t+=i.options.slidesToScroll<=i.options.slidesToShow?i.options.slidesToScroll:i.options.slidesToShow;else o=1+Math.ceil((i.slideCount-i.options.slidesToShow)/i.options.slidesToScroll);return o-1},e.prototype.getLeft=function(i){var e,t,o,s,n=this,r=0;return n.slideOffset=0,t=n.$slides.first().outerHeight(!0),!0===n.options.infinite?(n.slideCount>n.options.slidesToShow&&(n.slideOffset=n.slideWidth*n.options.slidesToShow*-1,s=-1,!0===n.options.vertical&&!0===n.options.centerMode&&(2===n.options.slidesToShow?s=-1.5:1===n.options.slidesToShow&&(s=-2)),r=t*n.options.slidesToShow*s),n.slideCount%n.options.slidesToScroll!=0&&i+n.options.slidesToScroll>n.slideCount&&n.slideCount>n.options.slidesToShow&&(i>n.slideCount?(n.slideOffset=(n.options.slidesToShow-(i-n.slideCount))*n.slideWidth*-1,r=(n.options.slidesToShow-(i-n.slideCount))*t*-1):(n.slideOffset=n.slideCount%n.options.slidesToScroll*n.slideWidth*-1,r=n.slideCount%n.options.slidesToScroll*t*-1))):i+n.options.slidesToShow>n.slideCount&&(n.slideOffset=(i+n.options.slidesToShow-n.slideCount)*n.slideWidth,r=(i+n.options.slidesToShow-n.slideCount)*t),n.slideCount<=n.options.slidesToShow&&(n.slideOffset=0,r=0),!0===n.options.centerMode&&n.slideCount<=n.options.slidesToShow?n.slideOffset=n.slideWidth*Math.floor(n.options.slidesToShow)/2-n.slideWidth*n.slideCount/2:!0===n.options.centerMode&&!0===n.options.infinite?n.slideOffset+=n.slideWidth*Math.floor(n.options.slidesToShow/2)-n.slideWidth:!0===n.options.centerMode&&(n.slideOffset=0,n.slideOffset+=n.slideWidth*Math.floor(n.options.slidesToShow/2)),e=!1===n.options.vertical?i*n.slideWidth*-1+n.slideOffset:i*t*-1+r,!0===n.options.variableWidth&&(o=n.slideCount<=n.options.slidesToShow||!1===n.options.infinite?n.$slideTrack.children(".slick-slide").eq(i):n.$slideTrack.children(".slick-slide").eq(i+n.options.slidesToShow),e=!0===n.options.rtl?o[0]?-1*(n.$slideTrack.width()-o[0].offsetLeft-o.width()):0:o[0]?-1*o[0].offsetLeft:0,!0===n.options.centerMode&&(o=n.slideCount<=n.options.slidesToShow||!1===n.options.infinite?n.$slideTrack.children(".slick-slide").eq(i):n.$slideTrack.children(".slick-slide").eq(i+n.options.slidesToShow+1),e=!0===n.options.rtl?o[0]?-1*(n.$slideTrack.width()-o[0].offsetLeft-o.width()):0:o[0]?-1*o[0].offsetLeft:0,e+=(n.$list.width()-o.outerWidth())/2)),e},e.prototype.getOption=e.prototype.slickGetOption=function(i){return this.options[i]},e.prototype.getNavigableIndexes=function(){var i,e=this,t=0,o=0,s=[];for(!1===e.options.infinite?i=e.slideCount:(t=-1*e.options.slidesToScroll,o=-1*e.options.slidesToScroll,i=2*e.slideCount);t<i;)s.push(t),t=o+e.options.slidesToScroll,o+=e.options.slidesToScroll<=e.options.slidesToShow?e.options.slidesToScroll:e.options.slidesToShow;return s},e.prototype.getSlick=function(){return this},e.prototype.getSlideCount=function(){var e,t,o=this;return t=!0===o.options.centerMode?o.slideWidth*Math.floor(o.options.slidesToShow/2):0,!0===o.options.swipeToSlide?(o.$slideTrack.find(".slick-slide").each(function(s,n){if(n.offsetLeft-t+i(n).outerWidth()/2>-1*o.swipeLeft)return e=n,!1}),Math.abs(i(e).attr("data-slick-index")-o.currentSlide)||1):o.options.slidesToScroll},e.prototype.goTo=e.prototype.slickGoTo=function(i,e){this.changeSlide({data:{message:"index",index:parseInt(i)}},e)},e.prototype.init=function(e){var t=this;i(t.$slider).hasClass("slick-initialized")||(i(t.$slider).addClass("slick-initialized"),t.buildRows(),t.buildOut(),t.setProps(),t.startLoad(),t.loadSlider(),t.initializeEvents(),t.updateArrows(),t.updateDots(),t.checkResponsive(!0),t.focusHandler()),e&&t.$slider.trigger("init",[t]),!0===t.options.accessibility&&t.initADA(),t.options.autoplay&&(t.paused=!1,t.autoPlay())},e.prototype.initADA=function(){var e=this,t=Math.ceil(e.slideCount/e.options.slidesToShow),o=e.getNavigableIndexes().filter(function(i){return i>=0&&i<e.slideCount});e.$slides.add(e.$slideTrack.find(".slick-cloned")).attr({"aria-hidden":"true",tabindex:"-1"}).find("a, input, button, select").attr({tabindex:"-1"}),null!==e.$dots&&(e.$slides.not(e.$slideTrack.find(".slick-cloned")).each(function(t){var s=o.indexOf(t);if(i(this).attr({role:"tabpanel",id:"slick-slide"+e.instanceUid+t,tabindex:-1}),-1!==s){var n="slick-slide-control"+e.instanceUid+s;i("#"+n).length&&i(this).attr({"aria-describedby":n})}}),e.$dots.attr("role","tablist").find("li").each(function(s){var n=o[s];i(this).attr({role:"presentation"}),i(this).find("button").first().attr({role:"tab",id:"slick-slide-control"+e.instanceUid+s,"aria-controls":"slick-slide"+e.instanceUid+n,"aria-label":s+1+" of "+t,"aria-selected":null,tabindex:"-1"})}).eq(e.currentSlide).find("button").attr({"aria-selected":"true",tabindex:"0"}).end());for(var s=e.currentSlide,n=s+e.options.slidesToShow;s<n;s++)e.options.focusOnChange?e.$slides.eq(s).attr({tabindex:"0"}):e.$slides.eq(s).removeAttr("tabindex");e.activateADA()},e.prototype.initArrowEvents=function(){var i=this;!0===i.options.arrows&&i.slideCount>i.options.slidesToShow&&(i.$prevArrow.off("click.slick").on("click.slick",{message:"previous"},i.changeSlide),i.$nextArrow.off("click.slick").on("click.slick",{message:"next"},i.changeSlide),!0===i.options.accessibility&&(i.$prevArrow.on("keydown.slick",i.keyHandler),i.$nextArrow.on("keydown.slick",i.keyHandler)))},e.prototype.initDotEvents=function(){var e=this;!0===e.options.dots&&e.slideCount>e.options.slidesToShow&&(i("li",e.$dots).on("click.slick",{message:"index"},e.changeSlide),!0===e.options.accessibility&&e.$dots.on("keydown.slick",e.keyHandler)),!0===e.options.dots&&!0===e.options.pauseOnDotsHover&&e.slideCount>e.options.slidesToShow&&i("li",e.$dots).on("mouseenter.slick",i.proxy(e.interrupt,e,!0)).on("mouseleave.slick",i.proxy(e.interrupt,e,!1))},e.prototype.initSlideEvents=function(){var e=this;e.options.pauseOnHover&&(e.$list.on("mouseenter.slick",i.proxy(e.interrupt,e,!0)),e.$list.on("mouseleave.slick",i.proxy(e.interrupt,e,!1)))},e.prototype.initializeEvents=function(){var e=this;e.initArrowEvents(),e.initDotEvents(),e.initSlideEvents(),e.$list.on("touchstart.slick mousedown.slick",{action:"start"},e.swipeHandler),e.$list.on("touchmove.slick mousemove.slick",{action:"move"},e.swipeHandler),e.$list.on("touchend.slick mouseup.slick",{action:"end"},e.swipeHandler),e.$list.on("touchcancel.slick mouseleave.slick",{action:"end"},e.swipeHandler),e.$list.on("click.slick",e.clickHandler),i(document).on(e.visibilityChange,i.proxy(e.visibility,e)),!0===e.options.accessibility&&e.$list.on("keydown.slick",e.keyHandler),!0===e.options.focusOnSelect&&i(e.$slideTrack).children().on("click.slick",e.selectHandler),i(window).on("orientationchange.slick.slick-"+e.instanceUid,i.proxy(e.orientationChange,e)),i(window).on("resize.slick.slick-"+e.instanceUid,i.proxy(e.resize,e)),i("[draggable!=true]",e.$slideTrack).on("dragstart",e.preventDefault),i(window).on("load.slick.slick-"+e.instanceUid,e.setPosition),i(e.setPosition)},e.prototype.initUI=function(){var i=this;!0===i.options.arrows&&i.slideCount>i.options.slidesToShow&&(i.$prevArrow.show(),i.$nextArrow.show()),!0===i.options.dots&&i.slideCount>i.options.slidesToShow&&i.$dots.show()},e.prototype.keyHandler=function(i){var e=this;i.target.tagName.match("TEXTAREA|INPUT|SELECT")||(37===i.keyCode&&!0===e.options.accessibility?e.changeSlide({data:{message:!0===e.options.rtl?"next":"previous"}}):39===i.keyCode&&!0===e.options.accessibility&&e.changeSlide({data:{message:!0===e.options.rtl?"previous":"next"}}))},e.prototype.lazyLoad=function(){var e,t,o,s=this;function n(e){i("img[data-lazy]",e).each(function(){var e=i(this),t=i(this).attr("data-lazy"),o=i(this).attr("data-srcset"),n=i(this).attr("data-sizes")||s.$slider.attr("data-sizes"),r=document.createElement("img");r.onload=function(){e.animate({opacity:0},100,function(){o&&(e.attr("srcset",o),n&&e.attr("sizes",n)),e.attr("src",t).animate({opacity:1},200,function(){e.removeAttr("data-lazy data-srcset data-sizes").removeClass("slick-loading")}),s.$slider.trigger("lazyLoaded",[s,e,t])})},r.onerror=function(){e.removeAttr("data-lazy").removeClass("slick-loading").addClass("slick-lazyload-error"),s.$slider.trigger("lazyLoadError",[s,e,t])},r.src=t})}if(!0===s.options.centerMode?!0===s.options.infinite?o=(t=s.currentSlide+(s.options.slidesToShow/2+1))+s.options.slidesToShow+2:(t=Math.max(0,s.currentSlide-(s.options.slidesToShow/2+1)),o=s.options.slidesToShow/2+1+2+s.currentSlide):(t=s.options.infinite?s.options.slidesToShow+s.currentSlide:s.currentSlide,o=Math.ceil(t+s.options.slidesToShow),!0===s.options.fade&&(t>0&&t--,o<=s.slideCount&&o++)),e=s.$slider.find(".slick-slide").slice(t,o),"anticipated"===s.options.lazyLoad)for(var r=t-1,l=o,d=s.$slider.find(".slick-slide"),a=0;a<s.options.slidesToScroll;a++)r<0&&(r=s.slideCount-1),e=(e=e.add(d.eq(r))).add(d.eq(l)),r--,l++;n(e),s.slideCount<=s.options.slidesToShow?n(s.$slider.find(".slick-slide")):s.currentSlide>=s.slideCount-s.options.slidesToShow?n(s.$slider.find(".slick-cloned").slice(0,s.options.slidesToShow)):0===s.currentSlide&&n(s.$slider.find(".slick-cloned").slice(-1*s.options.slidesToShow))},e.prototype.loadSlider=function(){var i=this;i.setPosition(),i.$slideTrack.css({opacity:1}),i.$slider.removeClass("slick-loading"),i.initUI(),"progressive"===i.options.lazyLoad&&i.progressiveLazyLoad()},e.prototype.next=e.prototype.slickNext=function(){this.changeSlide({data:{message:"next"}})},e.prototype.orientationChange=function(){this.checkResponsive(),this.setPosition()},e.prototype.pause=e.prototype.slickPause=function(){this.autoPlayClear(),this.paused=!0},e.prototype.play=e.prototype.slickPlay=function(){var i=this;i.autoPlay(),i.options.autoplay=!0,i.paused=!1,i.focussed=!1,i.interrupted=!1},e.prototype.postSlide=function(e){var t=this;t.unslicked||(t.$slider.trigger("afterChange",[t,e]),t.animating=!1,t.slideCount>t.options.slidesToShow&&t.setPosition(),t.swipeLeft=null,t.options.autoplay&&t.autoPlay(),!0===t.options.accessibility&&(t.initADA(),t.options.focusOnChange&&i(t.$slides.get(t.currentSlide)).attr("tabindex",0).focus()))},e.prototype.prev=e.prototype.slickPrev=function(){this.changeSlide({data:{message:"previous"}})},e.prototype.preventDefault=function(i){i.preventDefault()},e.prototype.progressiveLazyLoad=function(e){e=e||1;var t,o,s,n,r,l=this,d=i("img[data-lazy]",l.$slider);d.length?(t=d.first(),o=t.attr("data-lazy"),s=t.attr("data-srcset"),n=t.attr("data-sizes")||l.$slider.attr("data-sizes"),(r=document.createElement("img")).onload=function(){s&&(t.attr("srcset",s),n&&t.attr("sizes",n)),t.attr("src",o).removeAttr("data-lazy data-srcset data-sizes").removeClass("slick-loading"),!0===l.options.adaptiveHeight&&l.setPosition(),l.$slider.trigger("lazyLoaded",[l,t,o]),l.progressiveLazyLoad()},r.onerror=function(){e<3?setTimeout(function(){l.progressiveLazyLoad(e+1)},500):(t.removeAttr("data-lazy").removeClass("slick-loading").addClass("slick-lazyload-error"),l.$slider.trigger("lazyLoadError",[l,t,o]),l.progressiveLazyLoad())},r.src=o):l.$slider.trigger("allImagesLoaded",[l])},e.prototype.refresh=function(e){var t,o,s=this;o=s.slideCount-s.options.slidesToShow,!s.options.infinite&&s.currentSlide>o&&(s.currentSlide=o),s.slideCount<=s.options.slidesToShow&&(s.currentSlide=0),t=s.currentSlide,s.destroy(!0),i.extend(s,s.initials,{currentSlide:t}),s.init(),e||s.changeSlide({data:{message:"index",index:t}},!1)},e.prototype.registerBreakpoints=function(){var e,t,o,s=this,n=s.options.responsive||null;if("array"===i.type(n)&&n.length){s.respondTo=s.options.respondTo||"window";for(e in n)if(o=s.breakpoints.length-1,n.hasOwnProperty(e)){for(t=n[e].breakpoint;o>=0;)s.breakpoints[o]&&s.breakpoints[o]===t&&s.breakpoints.splice(o,1),o--;s.breakpoints.push(t),s.breakpointSettings[t]=n[e].settings}s.breakpoints.sort(function(i,e){return s.options.mobileFirst?i-e:e-i})}},e.prototype.reinit=function(){var e=this;e.$slides=e.$slideTrack.children(e.options.slide).addClass("slick-slide"),e.slideCount=e.$slides.length,e.currentSlide>=e.slideCount&&0!==e.currentSlide&&(e.currentSlide=e.currentSlide-e.options.slidesToScroll),e.slideCount<=e.options.slidesToShow&&(e.currentSlide=0),e.registerBreakpoints(),e.setProps(),e.setupInfinite(),e.buildArrows(),e.updateArrows(),e.initArrowEvents(),e.buildDots(),e.updateDots(),e.initDotEvents(),e.cleanUpSlideEvents(),e.initSlideEvents(),e.checkResponsive(!1,!0),!0===e.options.focusOnSelect&&i(e.$slideTrack).children().on("click.slick",e.selectHandler),e.setSlideClasses("number"==typeof e.currentSlide?e.currentSlide:0),e.setPosition(),e.focusHandler(),e.paused=!e.options.autoplay,e.autoPlay(),e.$slider.trigger("reInit",[e])},e.prototype.resize=function(){var e=this;i(window).width()!==e.windowWidth&&(clearTimeout(e.windowDelay),e.windowDelay=window.setTimeout(function(){e.windowWidth=i(window).width(),e.checkResponsive(),e.unslicked||e.setPosition()},50))},e.prototype.removeSlide=e.prototype.slickRemove=function(i,e,t){var o=this;if(i="boolean"==typeof i?!0===(e=i)?0:o.slideCount-1:!0===e?--i:i,o.slideCount<1||i<0||i>o.slideCount-1)return!1;o.unload(),!0===t?o.$slideTrack.children().remove():o.$slideTrack.children(this.options.slide).eq(i).remove(),o.$slides=o.$slideTrack.children(this.options.slide),o.$slideTrack.children(this.options.slide).detach(),o.$slideTrack.append(o.$slides),o.$slidesCache=o.$slides,o.reinit()},e.prototype.setCSS=function(i){var e,t,o=this,s={};!0===o.options.rtl&&(i=-i),e="left"==o.positionProp?Math.ceil(i)+"px":"0px",t="top"==o.positionProp?Math.ceil(i)+"px":"0px",s[o.positionProp]=i,!1===o.transformsEnabled?o.$slideTrack.css(s):(s={},!1===o.cssTransitions?(s[o.animType]="translate("+e+", "+t+")",o.$slideTrack.css(s)):(s[o.animType]="translate3d("+e+", "+t+", 0px)",o.$slideTrack.css(s)))},e.prototype.setDimensions=function(){var i=this;!1===i.options.vertical?!0===i.options.centerMode&&i.$list.css({padding:"0px "+i.options.centerPadding}):(i.$list.height(i.$slides.first().outerHeight(!0)*i.options.slidesToShow),!0===i.options.centerMode&&i.$list.css({padding:i.options.centerPadding+" 0px"})),i.listWidth=i.$list.width(),i.listHeight=i.$list.height(),!1===i.options.vertical&&!1===i.options.variableWidth?(i.slideWidth=Math.ceil(i.listWidth/i.options.slidesToShow),i.$slideTrack.width(Math.ceil(i.slideWidth*i.$slideTrack.children(".slick-slide").length))):!0===i.options.variableWidth?i.$slideTrack.width(5e3*i.slideCount):(i.slideWidth=Math.ceil(i.listWidth),i.$slideTrack.height(Math.ceil(i.$slides.first().outerHeight(!0)*i.$slideTrack.children(".slick-slide").length)));var e=i.$slides.first().outerWidth(!0)-i.$slides.first().width();!1===i.options.variableWidth&&i.$slideTrack.children(".slick-slide").width(i.slideWidth-e)},e.prototype.setFade=function(){var e,t=this;t.$slides.each(function(o,s){e=t.slideWidth*o*-1,!0===t.options.rtl?i(s).css({position:"relative",right:e,top:0,zIndex:t.options.zIndex-2,opacity:0}):i(s).css({position:"relative",left:e,top:0,zIndex:t.options.zIndex-2,opacity:0})}),t.$slides.eq(t.currentSlide).css({zIndex:t.options.zIndex-1,opacity:1})},e.prototype.setHeight=function(){var i=this;if(1===i.options.slidesToShow&&!0===i.options.adaptiveHeight&&!1===i.options.vertical){var e=i.$slides.eq(i.currentSlide).outerHeight(!0);i.$list.css("height",e)}},e.prototype.setOption=e.prototype.slickSetOption=function(){var e,t,o,s,n,r=this,l=!1;if("object"===i.type(arguments[0])?(o=arguments[0],l=arguments[1],n="multiple"):"string"===i.type(arguments[0])&&(o=arguments[0],s=arguments[1],l=arguments[2],"responsive"===arguments[0]&&"array"===i.type(arguments[1])?n="responsive":void 0!==arguments[1]&&(n="single")),"single"===n)r.options[o]=s;else if("multiple"===n)i.each(o,function(i,e){r.options[i]=e});else if("responsive"===n)for(t in s)if("array"!==i.type(r.options.responsive))r.options.responsive=[s[t]];else{for(e=r.options.responsive.length-1;e>=0;)r.options.responsive[e].breakpoint===s[t].breakpoint&&r.options.responsive.splice(e,1),e--;r.options.responsive.push(s[t])}l&&(r.unload(),r.reinit())},e.prototype.setPosition=function(){var i=this;i.setDimensions(),i.setHeight(),!1===i.options.fade?i.setCSS(i.getLeft(i.currentSlide)):i.setFade(),i.$slider.trigger("setPosition",[i])},e.prototype.setProps=function(){var i=this,e=document.body.style;i.positionProp=!0===i.options.vertical?"top":"left","top"===i.positionProp?i.$slider.addClass("slick-vertical"):i.$slider.removeClass("slick-vertical"),void 0===e.WebkitTransition&&void 0===e.MozTransition&&void 0===e.msTransition||!0===i.options.useCSS&&(i.cssTransitions=!0),i.options.fade&&("number"==typeof i.options.zIndex?i.options.zIndex<3&&(i.options.zIndex=3):i.options.zIndex=i.defaults.zIndex),void 0!==e.OTransform&&(i.animType="OTransform",i.transformType="-o-transform",i.transitionType="OTransition",void 0===e.perspectiveProperty&&void 0===e.webkitPerspective&&(i.animType=!1)),void 0!==e.MozTransform&&(i.animType="MozTransform",i.transformType="-moz-transform",i.transitionType="MozTransition",void 0===e.perspectiveProperty&&void 0===e.MozPerspective&&(i.animType=!1)),void 0!==e.webkitTransform&&(i.animType="webkitTransform",i.transformType="-webkit-transform",i.transitionType="webkitTransition",void 0===e.perspectiveProperty&&void 0===e.webkitPerspective&&(i.animType=!1)),void 0!==e.msTransform&&(i.animType="msTransform",i.transformType="-ms-transform",i.transitionType="msTransition",void 0===e.msTransform&&(i.animType=!1)),void 0!==e.transform&&!1!==i.animType&&(i.animType="transform",i.transformType="transform",i.transitionType="transition"),i.transformsEnabled=i.options.useTransform&&null!==i.animType&&!1!==i.animType},e.prototype.setSlideClasses=function(i){var e,t,o,s,n=this;if(t=n.$slider.find(".slick-slide").removeClass("slick-active slick-center slick-current").attr("aria-hidden","true"),n.$slides.eq(i).addClass("slick-current"),!0===n.options.centerMode){var r=n.options.slidesToShow%2==0?1:0;e=Math.floor(n.options.slidesToShow/2),!0===n.options.infinite&&(i>=e&&i<=n.slideCount-1-e?n.$slides.slice(i-e+r,i+e+1).addClass("slick-active").attr("aria-hidden","false"):(o=n.options.slidesToShow+i,t.slice(o-e+1+r,o+e+2).addClass("slick-active").attr("aria-hidden","false")),0===i?t.eq(t.length-1-n.options.slidesToShow).addClass("slick-center"):i===n.slideCount-1&&t.eq(n.options.slidesToShow).addClass("slick-center")),n.$slides.eq(i).addClass("slick-center")}else i>=0&&i<=n.slideCount-n.options.slidesToShow?n.$slides.slice(i,i+n.options.slidesToShow).addClass("slick-active").attr("aria-hidden","false"):t.length<=n.options.slidesToShow?t.addClass("slick-active").attr("aria-hidden","false"):(s=n.slideCount%n.options.slidesToShow,o=!0===n.options.infinite?n.options.slidesToShow+i:i,n.options.slidesToShow==n.options.slidesToScroll&&n.slideCount-i<n.options.slidesToShow?t.slice(o-(n.options.slidesToShow-s),o+s).addClass("slick-active").attr("aria-hidden","false"):t.slice(o,o+n.options.slidesToShow).addClass("slick-active").attr("aria-hidden","false"));"ondemand"!==n.options.lazyLoad&&"anticipated"!==n.options.lazyLoad||n.lazyLoad()},e.prototype.setupInfinite=function(){var e,t,o,s=this;if(!0===s.options.fade&&(s.options.centerMode=!1),!0===s.options.infinite&&!1===s.options.fade&&(t=null,s.slideCount>s.options.slidesToShow)){for(o=!0===s.options.centerMode?s.options.slidesToShow+1:s.options.slidesToShow,e=s.slideCount;e>s.slideCount-o;e-=1)t=e-1,i(s.$slides[t]).clone(!0).attr("id","").attr("data-slick-index",t-s.slideCount).prependTo(s.$slideTrack).addClass("slick-cloned");for(e=0;e<o+s.slideCount;e+=1)t=e,i(s.$slides[t]).clone(!0).attr("id","").attr("data-slick-index",t+s.slideCount).appendTo(s.$slideTrack).addClass("slick-cloned");s.$slideTrack.find(".slick-cloned").find("[id]").each(function(){i(this).attr("id","")})}},e.prototype.interrupt=function(i){i||this.autoPlay(),this.interrupted=i},e.prototype.selectHandler=function(e){var t=i(e.target).is(".slick-slide")?i(e.target):i(e.target).parents(".slick-slide"),o=parseInt(t.attr("data-slick-index"));o||(o=0),this.slideCount<=this.options.slidesToShow?this.slideHandler(o,!1,!0):this.slideHandler(o)},e.prototype.slideHandler=function(i,e,t){var o,s,n,r,l,d,a=this;if(e=e||!1,!(!0===a.animating&&!0===a.options.waitForAnimate||!0===a.options.fade&&a.currentSlide===i))if(!1===e&&a.asNavFor(i),o=i,l=a.getLeft(o),r=a.getLeft(a.currentSlide),a.currentLeft=null===a.swipeLeft?r:a.swipeLeft,!1===a.options.infinite&&!1===a.options.centerMode&&(i<0||i>a.getDotCount()*a.options.slidesToScroll))!1===a.options.fade&&(o=a.currentSlide,!0!==t&&a.slideCount>a.options.slidesToShow?a.animateSlide(r,function(){a.postSlide(o)}):a.postSlide(o));else if(!1===a.options.infinite&&!0===a.options.centerMode&&(i<0||i>a.slideCount-a.options.slidesToScroll))!1===a.options.fade&&(o=a.currentSlide,!0!==t&&a.slideCount>a.options.slidesToShow?a.animateSlide(r,function(){a.postSlide(o)}):a.postSlide(o));else{if(a.options.autoplay&&clearInterval(a.autoPlayTimer),s=o<0?a.slideCount%a.options.slidesToScroll!=0?a.slideCount-a.slideCount%a.options.slidesToScroll:a.slideCount+o:o>=a.slideCount?a.slideCount%a.options.slidesToScroll!=0?0:o-a.slideCount:o,a.animating=!0,a.$slider.trigger("beforeChange",[a,a.currentSlide,s]),n=a.currentSlide,a.currentSlide=s,a.setSlideClasses(a.currentSlide),a.options.asNavFor&&(d=(d=a.getNavTarget()).slick("getSlick")).slideCount<=d.options.slidesToShow&&d.setSlideClasses(a.currentSlide),a.updateDots(),a.updateArrows(),!0===a.options.fade)return!0!==t?(a.fadeSlideOut(n),a.fadeSlide(s,function(){a.postSlide(s)})):a.postSlide(s),void a.animateHeight();!0!==t&&a.slideCount>a.options.slidesToShow?a.animateSlide(l,function(){a.postSlide(s)}):a.postSlide(s)}},e.prototype.startLoad=function(){var i=this;!0===i.options.arrows&&i.slideCount>i.options.slidesToShow&&(i.$prevArrow.hide(),i.$nextArrow.hide()),!0===i.options.dots&&i.slideCount>i.options.slidesToShow&&i.$dots.hide(),i.$slider.addClass("slick-loading")},e.prototype.swipeDirection=function(){var i,e,t,o,s=this;return i=s.touchObject.startX-s.touchObject.curX,e=s.touchObject.startY-s.touchObject.curY,t=Math.atan2(e,i),(o=Math.round(180*t/Math.PI))<0&&(o=360-Math.abs(o)),o<=45&&o>=0?!1===s.options.rtl?"left":"right":o<=360&&o>=315?!1===s.options.rtl?"left":"right":o>=135&&o<=225?!1===s.options.rtl?"right":"left":!0===s.options.verticalSwiping?o>=35&&o<=135?"down":"up":"vertical"},e.prototype.swipeEnd=function(i){var e,t,o=this;if(o.dragging=!1,o.swiping=!1,o.scrolling)return o.scrolling=!1,!1;if(o.interrupted=!1,o.shouldClick=!(o.touchObject.swipeLength>10),void 0===o.touchObject.curX)return!1;if(!0===o.touchObject.edgeHit&&o.$slider.trigger("edge",[o,o.swipeDirection()]),o.touchObject.swipeLength>=o.touchObject.minSwipe){switch(t=o.swipeDirection()){case"left":case"down":e=o.options.swipeToSlide?o.checkNavigable(o.currentSlide+o.getSlideCount()):o.currentSlide+o.getSlideCount(),o.currentDirection=0;break;case"right":case"up":e=o.options.swipeToSlide?o.checkNavigable(o.currentSlide-o.getSlideCount()):o.currentSlide-o.getSlideCount(),o.currentDirection=1}"vertical"!=t&&(o.slideHandler(e),o.touchObject={},o.$slider.trigger("swipe",[o,t]))}else o.touchObject.startX!==o.touchObject.curX&&(o.slideHandler(o.currentSlide),o.touchObject={})},e.prototype.swipeHandler=function(i){var e=this;if(!(!1===e.options.swipe||"ontouchend"in document&&!1===e.options.swipe||!1===e.options.draggable&&-1!==i.type.indexOf("mouse")))switch(e.touchObject.fingerCount=i.originalEvent&&void 0!==i.originalEvent.touches?i.originalEvent.touches.length:1,e.touchObject.minSwipe=e.listWidth/e.options.touchThreshold,!0===e.options.verticalSwiping&&(e.touchObject.minSwipe=e.listHeight/e.options.touchThreshold),i.data.action){case"start":e.swipeStart(i);break;case"move":e.swipeMove(i);break;case"end":e.swipeEnd(i)}},e.prototype.swipeMove=function(i){var e,t,o,s,n,r,l=this;return n=void 0!==i.originalEvent?i.originalEvent.touches:null,!(!l.dragging||l.scrolling||n&&1!==n.length)&&(e=l.getLeft(l.currentSlide),l.touchObject.curX=void 0!==n?n[0].pageX:i.clientX,l.touchObject.curY=void 0!==n?n[0].pageY:i.clientY,l.touchObject.swipeLength=Math.round(Math.sqrt(Math.pow(l.touchObject.curX-l.touchObject.startX,2))),r=Math.round(Math.sqrt(Math.pow(l.touchObject.curY-l.touchObject.startY,2))),!l.options.verticalSwiping&&!l.swiping&&r>4?(l.scrolling=!0,!1):(!0===l.options.verticalSwiping&&(l.touchObject.swipeLength=r),t=l.swipeDirection(),void 0!==i.originalEvent&&l.touchObject.swipeLength>4&&(l.swiping=!0,i.preventDefault()),s=(!1===l.options.rtl?1:-1)*(l.touchObject.curX>l.touchObject.startX?1:-1),!0===l.options.verticalSwiping&&(s=l.touchObject.curY>l.touchObject.startY?1:-1),o=l.touchObject.swipeLength,l.touchObject.edgeHit=!1,!1===l.options.infinite&&(0===l.currentSlide&&"right"===t||l.currentSlide>=l.getDotCount()&&"left"===t)&&(o=l.touchObject.swipeLength*l.options.edgeFriction,l.touchObject.edgeHit=!0),!1===l.options.vertical?l.swipeLeft=e+o*s:l.swipeLeft=e+o*(l.$list.height()/l.listWidth)*s,!0===l.options.verticalSwiping&&(l.swipeLeft=e+o*s),!0!==l.options.fade&&!1!==l.options.touchMove&&(!0===l.animating?(l.swipeLeft=null,!1):void l.setCSS(l.swipeLeft))))},e.prototype.swipeStart=function(i){var e,t=this;if(t.interrupted=!0,1!==t.touchObject.fingerCount||t.slideCount<=t.options.slidesToShow)return t.touchObject={},!1;void 0!==i.originalEvent&&void 0!==i.originalEvent.touches&&(e=i.originalEvent.touches[0]),t.touchObject.startX=t.touchObject.curX=void 0!==e?e.pageX:i.clientX,t.touchObject.startY=t.touchObject.curY=void 0!==e?e.pageY:i.clientY,t.dragging=!0},e.prototype.unfilterSlides=e.prototype.slickUnfilter=function(){var i=this;null!==i.$slidesCache&&(i.unload(),i.$slideTrack.children(this.options.slide).detach(),i.$slidesCache.appendTo(i.$slideTrack),i.reinit())},e.prototype.unload=function(){var e=this;i(".slick-cloned",e.$slider).remove(),e.$dots&&e.$dots.remove(),e.$prevArrow&&e.htmlExpr.test(e.options.prevArrow)&&e.$prevArrow.remove(),e.$nextArrow&&e.htmlExpr.test(e.options.nextArrow)&&e.$nextArrow.remove(),e.$slides.removeClass("slick-slide slick-active slick-visible slick-current").attr("aria-hidden","true").css("width","")},e.prototype.unslick=function(i){this.$slider.trigger("unslick",[this,i]),this.destroy()},e.prototype.updateArrows=function(){var i=this;Math.floor(i.options.slidesToShow/2),!0===i.options.arrows&&i.slideCount>i.options.slidesToShow&&!i.options.infinite&&(i.$prevArrow.removeClass("slick-disabled").attr("aria-disabled","false"),i.$nextArrow.removeClass("slick-disabled").attr("aria-disabled","false"),0===i.currentSlide?(i.$prevArrow.addClass("slick-disabled").attr("aria-disabled","true"),i.$nextArrow.removeClass("slick-disabled").attr("aria-disabled","false")):i.currentSlide>=i.slideCount-i.options.slidesToShow&&!1===i.options.centerMode?(i.$nextArrow.addClass("slick-disabled").attr("aria-disabled","true"),i.$prevArrow.removeClass("slick-disabled").attr("aria-disabled","false")):i.currentSlide>=i.slideCount-1&&!0===i.options.centerMode&&(i.$nextArrow.addClass("slick-disabled").attr("aria-disabled","true"),i.$prevArrow.removeClass("slick-disabled").attr("aria-disabled","false")))},e.prototype.updateDots=function(){var i=this;null!==i.$dots&&(i.$dots.find("li").removeClass("slick-active").end(),i.$dots.find("li").eq(Math.floor(i.currentSlide/i.options.slidesToScroll)).addClass("slick-active"))},e.prototype.visibility=function(){this.options.autoplay&&(document[this.hidden]?this.interrupted=!0:this.interrupted=!1)},i.fn.slick=function(){var i,t,o=this,s=arguments[0],n=Array.prototype.slice.call(arguments,1),r=o.length;for(i=0;i<r;i++)if("object"==typeof s||void 0===s?o[i].slick=new e(o[i],s):t=o[i].slick[s].apply(o[i].slick,n),void 0!==t)return t;return o}});
+(function(i){"use strict";"function"==typeof define&&define.amd?define(["jquery"],i):"undefined"!=typeof exports?module.exports=i(require("jquery")):i(jQuery)})(function(i){"use strict";var e=window.Slick||{};e=function(){function e(e,o){var s,n=this;n.defaults={accessibility:!0,adaptiveHeight:!1,appendArrows:i(e),appendDots:i(e),arrows:!0,asNavFor:null,prevArrow:'<button class="slick-prev" aria-label="Previous" type="button">Previous</button>',nextArrow:'<button class="slick-next" aria-label="Next" type="button">Next</button>',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i('<button type="button" />').text(t+1)},dots:!1,dotsClass:"slick-dots",draggable:!0,easing:"linear",edgeFriction:.35,fade:!1,focusOnSelect:!1,focusOnChange:!1,infinite:!0,initialSlide:0,lazyLoad:"ondemand",mobileFirst:!1,pauseOnHover:!0,pauseOnFocus:!0,pauseOnDotsHover:!1,respondTo:"window",responsive:null,rows:1,rtl:!1,slide:"",slidesPerRow:1,slidesToShow:1,slidesToScroll:1,speed:500,swipe:!0,swipeToSlide:!1,touchMove:!0,touchThreshold:5,useCSS:!0,useTransform:!0,variableWidth:!1,vertical:!1,verticalSwiping:!1,waitForAnimate:!0,zIndex:1e3},n.initials={animating:!1,dragging:!1,autoPlayTimer:null,currentDirection:0,currentLeft:null,currentSlide:0,direction:1,$dots:null,listWidth:null,listHeight:null,loadIndex:0,$nextArrow:null,$prevArrow:null,scrolling:!1,slideCount:null,slideWidth:null,$slideTrack:null,$slides:null,sliding:!1,slideOffset:0,swipeLeft:null,swiping:!1,$list:null,touchObject:{},transformsEnabled:!1,unslicked:!1},i.extend(n,n.initials),n.activeBreakpoint=null,n.animType=null,n.animProp=null,n.breakpoints=[],n.breakpointSettings=[],n.cssTransitions=!1,n.focussed=!1,n.interrupted=!1,n.hidden="hidden",n.paused=!0,n.positionProp=null,n.respondTo=null,n.rowCount=1,n.shouldClick=!0,n.$slider=i(e),n.$slidesCache=null,n.transformType=null,n.transitionType=null,n.visibilityChange="visibilitychange",n.windowWidth=0,n.windowTimer=null,s=i(e).data("slick")||{},n.options=i.extend({},n.defaults,o,s),n.currentSlide=n.options.initialSlide,n.originalSettings=n.options,"undefined"!=typeof document.mozHidden?(n.hidden="mozHidden",n.visibilityChange="mozvisibilitychange"):"undefined"!=typeof document.webkitHidden&&(n.hidden="webkitHidden",n.visibilityChange="webkitvisibilitychange"),n.autoPlay=i.proxy(n.autoPlay,n),n.autoPlayClear=i.proxy(n.autoPlayClear,n),n.autoPlayIterator=i.proxy(n.autoPlayIterator,n),n.changeSlide=i.proxy(n.changeSlide,n),n.clickHandler=i.proxy(n.clickHandler,n),n.selectHandler=i.proxy(n.selectHandler,n),n.setPosition=i.proxy(n.setPosition,n),n.swipeHandler=i.proxy(n.swipeHandler,n),n.dragHandler=i.proxy(n.dragHandler,n),n.keyHandler=i.proxy(n.keyHandler,n),n.instanceUid=t++,n.htmlExpr=/^(?:\s*(<[\w\W]+>)[^>]*)$/,n.registerBreakpoints(),n.init(!0)}var t=0;return e}(),e.prototype.activateADA=function(){var i=this;i.$slideTrack.find(".slick-active").attr({"aria-hidden":"false"}).find("a, input, button, select").attr({tabindex:"0"})},e.prototype.addSlide=e.prototype.slickAdd=function(e,t,o){var s=this;if("boolean"==typeof t)o=t,t=null;else if(t<0||t>=s.slideCount)return!1;s.unload(),"number"==typeof t?0===t&&0===s.$slides.length?i(e).appendTo(s.$slideTrack):o?i(e).insertBefore(s.$slides.eq(t)):i(e).insertAfter(s.$slides.eq(t)):o===!0?i(e).prependTo(s.$slideTrack):i(e).appendTo(s.$slideTrack),s.$slides=s.$slideTrack.children(this.options.slide),s.$slideTrack.children(this.options.slide).detach(),s.$slideTrack.append(s.$slides),s.$slides.each(function(e,t){i(t).attr("data-slick-index",e)}),s.$slidesCache=s.$slides,s.reinit()},e.prototype.animateHeight=function(){var i=this;if(1===i.options.slidesToShow&&i.options.adaptiveHeight===!0&&i.options.vertical===!1){var e=i.$slides.eq(i.currentSlide).outerHeight(!0);i.$list.animate({height:e},i.options.speed)}},e.prototype.animateSlide=function(e,t){var o={},s=this;s.animateHeight(),s.options.rtl===!0&&s.options.vertical===!1&&(e=-e),s.transformsEnabled===!1?s.options.vertical===!1?s.$slideTrack.animate({left:e},s.options.speed,s.options.easing,t):s.$slideTrack.animate({top:e},s.options.speed,s.options.easing,t):s.cssTransitions===!1?(s.options.rtl===!0&&(s.currentLeft=-s.currentLeft),i({animStart:s.currentLeft}).animate({animStart:e},{duration:s.options.speed,easing:s.options.easing,step:function(i){i=Math.ceil(i),s.options.vertical===!1?(o[s.animType]="translate("+i+"px, 0px)",s.$slideTrack.css(o)):(o[s.animType]="translate(0px,"+i+"px)",s.$slideTrack.css(o))},complete:function(){t&&t.call()}})):(s.applyTransition(),e=Math.ceil(e),s.options.vertical===!1?o[s.animType]="translate3d("+e+"px, 0px, 0px)":o[s.animType]="translate3d(0px,"+e+"px, 0px)",s.$slideTrack.css(o),t&&setTimeout(function(){s.disableTransition(),t.call()},s.options.speed))},e.prototype.getNavTarget=function(){var e=this,t=e.options.asNavFor;return t&&null!==t&&(t=i(t).not(e.$slider)),t},e.prototype.asNavFor=function(e){var t=this,o=t.getNavTarget();null!==o&&"object"==typeof o&&o.each(function(){var t=i(this).slick("getSlick");t.unslicked||t.slideHandler(e,!0)})},e.prototype.applyTransition=function(i){var e=this,t={};e.options.fade===!1?t[e.transitionType]=e.transformType+" "+e.options.speed+"ms "+e.options.cssEase:t[e.transitionType]="opacity "+e.options.speed+"ms "+e.options.cssEase,e.options.fade===!1?e.$slideTrack.css(t):e.$slides.eq(i).css(t)},e.prototype.autoPlay=function(){var i=this;i.autoPlayClear(),i.slideCount>i.options.slidesToShow&&(i.autoPlayTimer=setInterval(i.autoPlayIterator,i.options.autoplaySpeed))},e.prototype.autoPlayClear=function(){var i=this;i.autoPlayTimer&&clearInterval(i.autoPlayTimer)},e.prototype.autoPlayIterator=function(){var i=this,e=i.currentSlide+i.options.slidesToScroll;i.paused||i.interrupted||i.focussed||(i.options.infinite===!1&&(1===i.direction&&i.currentSlide+1===i.slideCount-1?i.direction=0:0===i.direction&&(e=i.currentSlide-i.options.slidesToScroll,i.currentSlide-1===0&&(i.direction=1))),i.slideHandler(e))},e.prototype.buildArrows=function(){var e=this;e.options.arrows===!0&&(e.$prevArrow=i(e.options.prevArrow).addClass("slick-arrow"),e.$nextArrow=i(e.options.nextArrow).addClass("slick-arrow"),e.slideCount>e.options.slidesToShow?(e.$prevArrow.removeClass("slick-hidden").removeAttr("aria-hidden tabindex"),e.$nextArrow.removeClass("slick-hidden").removeAttr("aria-hidden tabindex"),e.htmlExpr.test(e.options.prevArrow)&&e.$prevArrow.prependTo(e.options.appendArrows),e.htmlExpr.test(e.options.nextArrow)&&e.$nextArrow.appendTo(e.options.appendArrows),e.options.infinite!==!0&&e.$prevArrow.addClass("slick-disabled").attr("aria-disabled","true")):e.$prevArrow.add(e.$nextArrow).addClass("slick-hidden").attr({"aria-disabled":"true",tabindex:"-1"}))},e.prototype.buildDots=function(){var e,t,o=this;if(o.options.dots===!0&&o.slideCount>o.options.slidesToShow){for(o.$slider.addClass("slick-dotted"),t=i("<ul />").addClass(o.options.dotsClass),e=0;e<=o.getDotCount();e+=1)t.append(i("<li />").append(o.options.customPaging.call(this,o,e)));o.$dots=t.appendTo(o.options.appendDots),o.$dots.find("li").first().addClass("slick-active")}},e.prototype.buildOut=function(){var e=this;e.$slides=e.$slider.children(e.options.slide+":not(.slick-cloned)").addClass("slick-slide"),e.slideCount=e.$slides.length,e.$slides.each(function(e,t){i(t).attr("data-slick-index",e).data("originalStyling",i(t).attr("style")||"")}),e.$slider.addClass("slick-slider"),e.$slideTrack=0===e.slideCount?i('<div class="slick-track"/>').appendTo(e.$slider):e.$slides.wrapAll('<div class="slick-track"/>').parent(),e.$list=e.$slideTrack.wrap('<div class="slick-list"/>').parent(),e.$slideTrack.css("opacity",0),e.options.centerMode!==!0&&e.options.swipeToSlide!==!0||(e.options.slidesToScroll=1),i("img[data-lazy]",e.$slider).not("[src]").addClass("slick-loading"),e.setupInfinite(),e.buildArrows(),e.buildDots(),e.updateDots(),e.setSlideClasses("number"==typeof e.currentSlide?e.currentSlide:0),e.options.draggable===!0&&e.$list.addClass("draggable")},e.prototype.buildRows=function(){var i,e,t,o,s,n,r,l=this;if(o=document.createDocumentFragment(),n=l.$slider.children(),l.options.rows>0){for(r=l.options.slidesPerRow*l.options.rows,s=Math.ceil(n.length/r),i=0;i<s;i++){var d=document.createElement("div");for(e=0;e<l.options.rows;e++){var a=document.createElement("div");for(t=0;t<l.options.slidesPerRow;t++){var c=i*r+(e*l.options.slidesPerRow+t);n.get(c)&&a.appendChild(n.get(c))}d.appendChild(a)}o.appendChild(d)}l.$slider.empty().append(o),l.$slider.children().children().children().css({width:100/l.options.slidesPerRow+"%",display:"inline-block"})}},e.prototype.checkResponsive=function(e,t){var o,s,n,r=this,l=!1,d=r.$slider.width(),a=window.innerWidth||i(window).width();if("window"===r.respondTo?n=a:"slider"===r.respondTo?n=d:"min"===r.respondTo&&(n=Math.min(a,d)),r.options.responsive&&r.options.responsive.length&&null!==r.options.responsive){s=null;for(o in r.breakpoints)r.breakpoints.hasOwnProperty(o)&&(r.originalSettings.mobileFirst===!1?n<r.breakpoints[o]&&(s=r.breakpoints[o]):n>r.breakpoints[o]&&(s=r.breakpoints[o]));null!==s?null!==r.activeBreakpoint?(s!==r.activeBreakpoint||t)&&(r.activeBreakpoint=s,"unslick"===r.breakpointSettings[s]?r.unslick(s):(r.options=i.extend({},r.originalSettings,r.breakpointSettings[s]),e===!0&&(r.currentSlide=r.options.initialSlide),r.refresh(e)),l=s):(r.activeBreakpoint=s,"unslick"===r.breakpointSettings[s]?r.unslick(s):(r.options=i.extend({},r.originalSettings,r.breakpointSettings[s]),e===!0&&(r.currentSlide=r.options.initialSlide),r.refresh(e)),l=s):null!==r.activeBreakpoint&&(r.activeBreakpoint=null,r.options=r.originalSettings,e===!0&&(r.currentSlide=r.options.initialSlide),r.refresh(e),l=s),e||l===!1||r.$slider.trigger("breakpoint",[r,l])}},e.prototype.changeSlide=function(e,t){var o,s,n,r=this,l=i(e.currentTarget);switch(l.is("a")&&e.preventDefault(),l.is("li")||(l=l.closest("li")),n=r.slideCount%r.options.slidesToScroll!==0,o=n?0:(r.slideCount-r.currentSlide)%r.options.slidesToScroll,e.data.message){case"previous":s=0===o?r.options.slidesToScroll:r.options.slidesToShow-o,r.slideCount>r.options.slidesToShow&&r.slideHandler(r.currentSlide-s,!1,t);break;case"next":s=0===o?r.options.slidesToScroll:o,r.slideCount>r.options.slidesToShow&&r.slideHandler(r.currentSlide+s,!1,t);break;case"index":var d=0===e.data.index?0:e.data.index||l.index()*r.options.slidesToScroll;r.slideHandler(r.checkNavigable(d),!1,t),l.children().trigger("focus");break;default:return}},e.prototype.checkNavigable=function(i){var e,t,o=this;if(e=o.getNavigableIndexes(),t=0,i>e[e.length-1])i=e[e.length-1];else for(var s in e){if(i<e[s]){i=t;break}t=e[s]}return i},e.prototype.cleanUpEvents=function(){var e=this;e.options.dots&&null!==e.$dots&&(i("li",e.$dots).off("click.slick",e.changeSlide).off("mouseenter.slick",i.proxy(e.interrupt,e,!0)).off("mouseleave.slick",i.proxy(e.interrupt,e,!1)),e.options.accessibility===!0&&e.$dots.off("keydown.slick",e.keyHandler)),e.$slider.off("focus.slick blur.slick"),e.options.arrows===!0&&e.slideCount>e.options.slidesToShow&&(e.$prevArrow&&e.$prevArrow.off("click.slick",e.changeSlide),e.$nextArrow&&e.$nextArrow.off("click.slick",e.changeSlide),e.options.accessibility===!0&&(e.$prevArrow&&e.$prevArrow.off("keydown.slick",e.keyHandler),e.$nextArrow&&e.$nextArrow.off("keydown.slick",e.keyHandler))),e.$list.off("touchstart.slick mousedown.slick",e.swipeHandler),e.$list.off("touchmove.slick mousemove.slick",e.swipeHandler),e.$list.off("touchend.slick mouseup.slick",e.swipeHandler),e.$list.off("touchcancel.slick mouseleave.slick",e.swipeHandler),e.$list.off("click.slick",e.clickHandler),i(document).off(e.visibilityChange,e.visibility),e.cleanUpSlideEvents(),e.options.accessibility===!0&&e.$list.off("keydown.slick",e.keyHandler),e.options.focusOnSelect===!0&&i(e.$slideTrack).children().off("click.slick",e.selectHandler),i(window).off("orientationchange.slick.slick-"+e.instanceUid,e.orientationChange),i(window).off("resize.slick.slick-"+e.instanceUid,e.resize),i("[draggable!=true]",e.$slideTrack).off("dragstart",e.preventDefault),i(window).off("load.slick.slick-"+e.instanceUid,e.setPosition)},e.prototype.cleanUpSlideEvents=function(){var e=this;e.$list.off("mouseenter.slick",i.proxy(e.interrupt,e,!0)),e.$list.off("mouseleave.slick",i.proxy(e.interrupt,e,!1))},e.prototype.cleanUpRows=function(){var i,e=this;e.options.rows>0&&(i=e.$slides.children().children(),i.removeAttr("style"),e.$slider.empty().append(i))},e.prototype.clickHandler=function(i){var e=this;e.shouldClick===!1&&(i.stopImmediatePropagation(),i.stopPropagation(),i.preventDefault())},e.prototype.destroy=function(e){var t=this;t.autoPlayClear(),t.touchObject={},t.cleanUpEvents(),i(".slick-cloned",t.$slider).detach(),t.$dots&&t.$dots.remove(),t.$prevArrow&&t.$prevArrow.length&&(t.$prevArrow.removeClass("slick-disabled slick-arrow slick-hidden").removeAttr("aria-hidden aria-disabled tabindex").css("display",""),t.htmlExpr.test(t.options.prevArrow)&&t.$prevArrow.remove()),t.$nextArrow&&t.$nextArrow.length&&(t.$nextArrow.removeClass("slick-disabled slick-arrow slick-hidden").removeAttr("aria-hidden aria-disabled tabindex").css("display",""),t.htmlExpr.test(t.options.nextArrow)&&t.$nextArrow.remove()),t.$slides&&(t.$slides.removeClass("slick-slide slick-active slick-center slick-visible slick-current").removeAttr("aria-hidden").removeAttr("data-slick-index").each(function(){i(this).attr("style",i(this).data("originalStyling"))}),t.$slideTrack.children(this.options.slide).detach(),t.$slideTrack.detach(),t.$list.detach(),t.$slider.append(t.$slides)),t.cleanUpRows(),t.$slider.removeClass("slick-slider"),t.$slider.removeClass("slick-initialized"),t.$slider.removeClass("slick-dotted"),t.unslicked=!0,e||t.$slider.trigger("destroy",[t])},e.prototype.disableTransition=function(i){var e=this,t={};t[e.transitionType]="",e.options.fade===!1?e.$slideTrack.css(t):e.$slides.eq(i).css(t)},e.prototype.fadeSlide=function(i,e){var t=this;t.cssTransitions===!1?(t.$slides.eq(i).css({zIndex:t.options.zIndex}),t.$slides.eq(i).animate({opacity:1},t.options.speed,t.options.easing,e)):(t.applyTransition(i),t.$slides.eq(i).css({opacity:1,zIndex:t.options.zIndex}),e&&setTimeout(function(){t.disableTransition(i),e.call()},t.options.speed))},e.prototype.fadeSlideOut=function(i){var e=this;e.cssTransitions===!1?e.$slides.eq(i).animate({opacity:0,zIndex:e.options.zIndex-2},e.options.speed,e.options.easing):(e.applyTransition(i),e.$slides.eq(i).css({opacity:0,zIndex:e.options.zIndex-2}))},e.prototype.filterSlides=e.prototype.slickFilter=function(i){var e=this;null!==i&&(e.$slidesCache=e.$slides,e.unload(),e.$slideTrack.children(this.options.slide).detach(),e.$slidesCache.filter(i).appendTo(e.$slideTrack),e.reinit())},e.prototype.focusHandler=function(){var e=this;e.$slider.off("focus.slick blur.slick").on("focus.slick","*",function(t){var o=i(this);setTimeout(function(){e.options.pauseOnFocus&&o.is(":focus")&&(e.focussed=!0,e.autoPlay())},0)}).on("blur.slick","*",function(t){i(this);e.options.pauseOnFocus&&(e.focussed=!1,e.autoPlay())})},e.prototype.getCurrent=e.prototype.slickCurrentSlide=function(){var i=this;return i.currentSlide},e.prototype.getDotCount=function(){var i=this,e=0,t=0,o=0;if(i.options.infinite===!0)if(i.slideCount<=i.options.slidesToShow)++o;else for(;e<i.slideCount;)++o,e=t+i.options.slidesToScroll,t+=i.options.slidesToScroll<=i.options.slidesToShow?i.options.slidesToScroll:i.options.slidesToShow;else if(i.options.centerMode===!0)o=i.slideCount;else if(i.options.asNavFor)for(;e<i.slideCount;)++o,e=t+i.options.slidesToScroll,t+=i.options.slidesToScroll<=i.options.slidesToShow?i.options.slidesToScroll:i.options.slidesToShow;else o=1+Math.ceil((i.slideCount-i.options.slidesToShow)/i.options.slidesToScroll);return o-1},e.prototype.getLeft=function(i){var e,t,o,s,n=this,r=0;return n.slideOffset=0,t=n.$slides.first().outerHeight(!0),n.options.infinite===!0?(n.slideCount>n.options.slidesToShow&&(n.slideOffset=n.slideWidth*n.options.slidesToShow*-1,s=-1,n.options.vertical===!0&&n.options.centerMode===!0&&(2===n.options.slidesToShow?s=-1.5:1===n.options.slidesToShow&&(s=-2)),r=t*n.options.slidesToShow*s),n.slideCount%n.options.slidesToScroll!==0&&i+n.options.slidesToScroll>n.slideCount&&n.slideCount>n.options.slidesToShow&&(i>n.slideCount?(n.slideOffset=(n.options.slidesToShow-(i-n.slideCount))*n.slideWidth*-1,r=(n.options.slidesToShow-(i-n.slideCount))*t*-1):(n.slideOffset=n.slideCount%n.options.slidesToScroll*n.slideWidth*-1,r=n.slideCount%n.options.slidesToScroll*t*-1))):i+n.options.slidesToShow>n.slideCount&&(n.slideOffset=(i+n.options.slidesToShow-n.slideCount)*n.slideWidth,r=(i+n.options.slidesToShow-n.slideCount)*t),n.slideCount<=n.options.slidesToShow&&(n.slideOffset=0,r=0),n.options.centerMode===!0&&n.slideCount<=n.options.slidesToShow?n.slideOffset=n.slideWidth*Math.floor(n.options.slidesToShow)/2-n.slideWidth*n.slideCount/2:n.options.centerMode===!0&&n.options.infinite===!0?n.slideOffset+=n.slideWidth*Math.floor(n.options.slidesToShow/2)-n.slideWidth:n.options.centerMode===!0&&(n.slideOffset=0,n.slideOffset+=n.slideWidth*Math.floor(n.options.slidesToShow/2)),e=n.options.vertical===!1?i*n.slideWidth*-1+n.slideOffset:i*t*-1+r,n.options.variableWidth===!0&&(o=n.slideCount<=n.options.slidesToShow||n.options.infinite===!1?n.$slideTrack.children(".slick-slide").eq(i):n.$slideTrack.children(".slick-slide").eq(i+n.options.slidesToShow),e=n.options.rtl===!0?o[0]?(n.$slideTrack.width()-o[0].offsetLeft-o.width())*-1:0:o[0]?o[0].offsetLeft*-1:0,n.options.centerMode===!0&&(o=n.slideCount<=n.options.slidesToShow||n.options.infinite===!1?n.$slideTrack.children(".slick-slide").eq(i):n.$slideTrack.children(".slick-slide").eq(i+n.options.slidesToShow+1),e=n.options.rtl===!0?o[0]?(n.$slideTrack.width()-o[0].offsetLeft-o.width())*-1:0:o[0]?o[0].offsetLeft*-1:0,e+=(n.$list.width()-o.outerWidth())/2)),e},e.prototype.getOption=e.prototype.slickGetOption=function(i){var e=this;return e.options[i]},e.prototype.getNavigableIndexes=function(){var i,e=this,t=0,o=0,s=[];for(e.options.infinite===!1?i=e.slideCount:(t=e.options.slidesToScroll*-1,o=e.options.slidesToScroll*-1,i=2*e.slideCount);t<i;)s.push(t),t=o+e.options.slidesToScroll,o+=e.options.slidesToScroll<=e.options.slidesToShow?e.options.slidesToScroll:e.options.slidesToShow;return s},e.prototype.getSlick=function(){return this},e.prototype.getSlideCount=function(){var e,t,o,s,n=this;return s=n.options.centerMode===!0?Math.floor(n.$list.width()/2):0,o=n.swipeLeft*-1+s,n.options.swipeToSlide===!0?(n.$slideTrack.find(".slick-slide").each(function(e,s){var r,l,d;if(r=i(s).outerWidth(),l=s.offsetLeft,n.options.centerMode!==!0&&(l+=r/2),d=l+r,o<d)return t=s,!1}),e=Math.abs(i(t).attr("data-slick-index")-n.currentSlide)||1):n.options.slidesToScroll},e.prototype.goTo=e.prototype.slickGoTo=function(i,e){var t=this;t.changeSlide({data:{message:"index",index:parseInt(i)}},e)},e.prototype.init=function(e){var t=this;i(t.$slider).hasClass("slick-initialized")||(i(t.$slider).addClass("slick-initialized"),t.buildRows(),t.buildOut(),t.setProps(),t.startLoad(),t.loadSlider(),t.initializeEvents(),t.updateArrows(),t.updateDots(),t.checkResponsive(!0),t.focusHandler()),e&&t.$slider.trigger("init",[t]),t.options.accessibility===!0&&t.initADA(),t.options.autoplay&&(t.paused=!1,t.autoPlay())},e.prototype.initADA=function(){var e=this,t=Math.ceil(e.slideCount/e.options.slidesToShow),o=e.getNavigableIndexes().filter(function(i){return i>=0&&i<e.slideCount});e.$slides.add(e.$slideTrack.find(".slick-cloned")).attr({"aria-hidden":"true",tabindex:"-1"}).find("a, input, button, select").attr({tabindex:"-1"}),null!==e.$dots&&(e.$slides.not(e.$slideTrack.find(".slick-cloned")).each(function(t){var s=o.indexOf(t);if(i(this).attr({role:"tabpanel",id:"slick-slide"+e.instanceUid+t,tabindex:-1}),s!==-1){var n="slick-slide-control"+e.instanceUid+s;i("#"+n).length&&i(this).attr({"aria-describedby":n})}}),e.$dots.attr("role","tablist").find("li").each(function(s){var n=o[s];i(this).attr({role:"presentation"}),i(this).find("button").first().attr({role:"tab",id:"slick-slide-control"+e.instanceUid+s,"aria-controls":"slick-slide"+e.instanceUid+n,"aria-label":s+1+" of "+t,"aria-selected":null,tabindex:"-1"})}).eq(e.currentSlide).find("button").attr({"aria-selected":"true",tabindex:"0"}).end());for(var s=e.currentSlide,n=s+e.options.slidesToShow;s<n;s++)e.options.focusOnChange?e.$slides.eq(s).attr({tabindex:"0"}):e.$slides.eq(s).removeAttr("tabindex");e.activateADA()},e.prototype.initArrowEvents=function(){var i=this;i.options.arrows===!0&&i.slideCount>i.options.slidesToShow&&(i.$prevArrow.off("click.slick").on("click.slick",{message:"previous"},i.changeSlide),i.$nextArrow.off("click.slick").on("click.slick",{message:"next"},i.changeSlide),i.options.accessibility===!0&&(i.$prevArrow.on("keydown.slick",i.keyHandler),i.$nextArrow.on("keydown.slick",i.keyHandler)))},e.prototype.initDotEvents=function(){var e=this;e.options.dots===!0&&e.slideCount>e.options.slidesToShow&&(i("li",e.$dots).on("click.slick",{message:"index"},e.changeSlide),e.options.accessibility===!0&&e.$dots.on("keydown.slick",e.keyHandler)),e.options.dots===!0&&e.options.pauseOnDotsHover===!0&&e.slideCount>e.options.slidesToShow&&i("li",e.$dots).on("mouseenter.slick",i.proxy(e.interrupt,e,!0)).on("mouseleave.slick",i.proxy(e.interrupt,e,!1))},e.prototype.initSlideEvents=function(){var e=this;e.options.pauseOnHover&&(e.$list.on("mouseenter.slick",i.proxy(e.interrupt,e,!0)),e.$list.on("mouseleave.slick",i.proxy(e.interrupt,e,!1)))},e.prototype.initializeEvents=function(){var e=this;e.initArrowEvents(),e.initDotEvents(),e.initSlideEvents(),e.$list.on("touchstart.slick mousedown.slick",{action:"start"},e.swipeHandler),e.$list.on("touchmove.slick mousemove.slick",{action:"move"},e.swipeHandler),e.$list.on("touchend.slick mouseup.slick",{action:"end"},e.swipeHandler),e.$list.on("touchcancel.slick mouseleave.slick",{action:"end"},e.swipeHandler),e.$list.on("click.slick",e.clickHandler),i(document).on(e.visibilityChange,i.proxy(e.visibility,e)),e.options.accessibility===!0&&e.$list.on("keydown.slick",e.keyHandler),e.options.focusOnSelect===!0&&i(e.$slideTrack).children().on("click.slick",e.selectHandler),i(window).on("orientationchange.slick.slick-"+e.instanceUid,i.proxy(e.orientationChange,e)),i(window).on("resize.slick.slick-"+e.instanceUid,i.proxy(e.resize,e)),i("[draggable!=true]",e.$slideTrack).on("dragstart",e.preventDefault),i(window).on("load.slick.slick-"+e.instanceUid,e.setPosition),i(e.setPosition)},e.prototype.initUI=function(){var i=this;i.options.arrows===!0&&i.slideCount>i.options.slidesToShow&&(i.$prevArrow.show(),i.$nextArrow.show()),i.options.dots===!0&&i.slideCount>i.options.slidesToShow&&i.$dots.show()},e.prototype.keyHandler=function(i){var e=this;i.target.tagName.match("TEXTAREA|INPUT|SELECT")||(37===i.keyCode&&e.options.accessibility===!0?e.changeSlide({data:{message:e.options.rtl===!0?"next":"previous"}}):39===i.keyCode&&e.options.accessibility===!0&&e.changeSlide({data:{message:e.options.rtl===!0?"previous":"next"}}))},e.prototype.lazyLoad=function(){function e(e){i("img[data-lazy]",e).each(function(){var e=i(this),t=i(this).attr("data-lazy"),o=i(this).attr("data-srcset"),s=i(this).attr("data-sizes")||r.$slider.attr("data-sizes"),n=document.createElement("img");n.onload=function(){e.animate({opacity:0},100,function(){o&&(e.attr("srcset",o),s&&e.attr("sizes",s)),e.attr("src",t).animate({opacity:1},200,function(){e.removeAttr("data-lazy data-srcset data-sizes").removeClass("slick-loading")}),r.$slider.trigger("lazyLoaded",[r,e,t])})},n.onerror=function(){e.removeAttr("data-lazy").removeClass("slick-loading").addClass("slick-lazyload-error"),r.$slider.trigger("lazyLoadError",[r,e,t])},n.src=t})}var t,o,s,n,r=this;if(r.options.centerMode===!0?r.options.infinite===!0?(s=r.currentSlide+(r.options.slidesToShow/2+1),n=s+r.options.slidesToShow+2):(s=Math.max(0,r.currentSlide-(r.options.slidesToShow/2+1)),n=2+(r.options.slidesToShow/2+1)+r.currentSlide):(s=r.options.infinite?r.options.slidesToShow+r.currentSlide:r.currentSlide,n=Math.ceil(s+r.options.slidesToShow),r.options.fade===!0&&(s>0&&s--,n<=r.slideCount&&n++)),t=r.$slider.find(".slick-slide").slice(s,n),"anticipated"===r.options.lazyLoad)for(var l=s-1,d=n,a=r.$slider.find(".slick-slide"),c=0;c<r.options.slidesToScroll;c++)l<0&&(l=r.slideCount-1),t=t.add(a.eq(l)),t=t.add(a.eq(d)),l--,d++;e(t),r.slideCount<=r.options.slidesToShow?(o=r.$slider.find(".slick-slide"),e(o)):r.currentSlide>=r.slideCount-r.options.slidesToShow?(o=r.$slider.find(".slick-cloned").slice(0,r.options.slidesToShow),e(o)):0===r.currentSlide&&(o=r.$slider.find(".slick-cloned").slice(r.options.slidesToShow*-1),e(o))},e.prototype.loadSlider=function(){var i=this;i.setPosition(),i.$slideTrack.css({opacity:1}),i.$slider.removeClass("slick-loading"),i.initUI(),"progressive"===i.options.lazyLoad&&i.progressiveLazyLoad()},e.prototype.next=e.prototype.slickNext=function(){var i=this;i.changeSlide({data:{message:"next"}})},e.prototype.orientationChange=function(){var i=this;i.checkResponsive(),i.setPosition()},e.prototype.pause=e.prototype.slickPause=function(){var i=this;i.autoPlayClear(),i.paused=!0},e.prototype.play=e.prototype.slickPlay=function(){var i=this;i.autoPlay(),i.options.autoplay=!0,i.paused=!1,i.focussed=!1,i.interrupted=!1},e.prototype.postSlide=function(e){var t=this;if(!t.unslicked&&(t.$slider.trigger("afterChange",[t,e]),t.animating=!1,t.slideCount>t.options.slidesToShow&&t.setPosition(),t.swipeLeft=null,t.options.autoplay&&t.autoPlay(),t.options.accessibility===!0&&(t.initADA(),t.options.focusOnChange))){var o=i(t.$slides.get(t.currentSlide));o.attr("tabindex",0).focus()}},e.prototype.prev=e.prototype.slickPrev=function(){var i=this;i.changeSlide({data:{message:"previous"}})},e.prototype.preventDefault=function(i){i.preventDefault()},e.prototype.progressiveLazyLoad=function(e){e=e||1;var t,o,s,n,r,l=this,d=i("img[data-lazy]",l.$slider);d.length?(t=d.first(),o=t.attr("data-lazy"),s=t.attr("data-srcset"),n=t.attr("data-sizes")||l.$slider.attr("data-sizes"),r=document.createElement("img"),r.onload=function(){s&&(t.attr("srcset",s),n&&t.attr("sizes",n)),t.attr("src",o).removeAttr("data-lazy data-srcset data-sizes").removeClass("slick-loading"),l.options.adaptiveHeight===!0&&l.setPosition(),l.$slider.trigger("lazyLoaded",[l,t,o]),l.progressiveLazyLoad()},r.onerror=function(){e<3?setTimeout(function(){l.progressiveLazyLoad(e+1)},500):(t.removeAttr("data-lazy").removeClass("slick-loading").addClass("slick-lazyload-error"),l.$slider.trigger("lazyLoadError",[l,t,o]),l.progressiveLazyLoad())},r.src=o):l.$slider.trigger("allImagesLoaded",[l])},e.prototype.refresh=function(e){var t,o,s=this;o=s.slideCount-s.options.slidesToShow,!s.options.infinite&&s.currentSlide>o&&(s.currentSlide=o),s.slideCount<=s.options.slidesToShow&&(s.currentSlide=0),t=s.currentSlide,s.destroy(!0),i.extend(s,s.initials,{currentSlide:t}),s.init(),e||s.changeSlide({data:{message:"index",index:t}},!1)},e.prototype.registerBreakpoints=function(){var e,t,o,s=this,n=s.options.responsive||null;if("array"===i.type(n)&&n.length){s.respondTo=s.options.respondTo||"window";for(e in n)if(o=s.breakpoints.length-1,n.hasOwnProperty(e)){for(t=n[e].breakpoint;o>=0;)s.breakpoints[o]&&s.breakpoints[o]===t&&s.breakpoints.splice(o,1),o--;s.breakpoints.push(t),s.breakpointSettings[t]=n[e].settings}s.breakpoints.sort(function(i,e){return s.options.mobileFirst?i-e:e-i})}},e.prototype.reinit=function(){var e=this;e.$slides=e.$slideTrack.children(e.options.slide).addClass("slick-slide"),e.slideCount=e.$slides.length,e.currentSlide>=e.slideCount&&0!==e.currentSlide&&(e.currentSlide=e.currentSlide-e.options.slidesToScroll),e.slideCount<=e.options.slidesToShow&&(e.currentSlide=0),e.registerBreakpoints(),e.setProps(),e.setupInfinite(),e.buildArrows(),e.updateArrows(),e.initArrowEvents(),e.buildDots(),e.updateDots(),e.initDotEvents(),e.cleanUpSlideEvents(),e.initSlideEvents(),e.checkResponsive(!1,!0),e.options.focusOnSelect===!0&&i(e.$slideTrack).children().on("click.slick",e.selectHandler),e.setSlideClasses("number"==typeof e.currentSlide?e.currentSlide:0),e.setPosition(),e.focusHandler(),e.paused=!e.options.autoplay,e.autoPlay(),e.$slider.trigger("reInit",[e])},e.prototype.resize=function(){var e=this;i(window).width()!==e.windowWidth&&(clearTimeout(e.windowDelay),e.windowDelay=window.setTimeout(function(){e.windowWidth=i(window).width(),e.checkResponsive(),e.unslicked||e.setPosition()},50))},e.prototype.removeSlide=e.prototype.slickRemove=function(i,e,t){var o=this;return"boolean"==typeof i?(e=i,i=e===!0?0:o.slideCount-1):i=e===!0?--i:i,!(o.slideCount<1||i<0||i>o.slideCount-1)&&(o.unload(),t===!0?o.$slideTrack.children().remove():o.$slideTrack.children(this.options.slide).eq(i).remove(),o.$slides=o.$slideTrack.children(this.options.slide),o.$slideTrack.children(this.options.slide).detach(),o.$slideTrack.append(o.$slides),o.$slidesCache=o.$slides,void o.reinit())},e.prototype.setCSS=function(i){var e,t,o=this,s={};o.options.rtl===!0&&(i=-i),e="left"==o.positionProp?Math.ceil(i)+"px":"0px",t="top"==o.positionProp?Math.ceil(i)+"px":"0px",s[o.positionProp]=i,o.transformsEnabled===!1?o.$slideTrack.css(s):(s={},o.cssTransitions===!1?(s[o.animType]="translate("+e+", "+t+")",o.$slideTrack.css(s)):(s[o.animType]="translate3d("+e+", "+t+", 0px)",o.$slideTrack.css(s)))},e.prototype.setDimensions=function(){var i=this;i.options.vertical===!1?i.options.centerMode===!0&&i.$list.css({padding:"0px "+i.options.centerPadding}):(i.$list.height(i.$slides.first().outerHeight(!0)*i.options.slidesToShow),i.options.centerMode===!0&&i.$list.css({padding:i.options.centerPadding+" 0px"})),i.listWidth=i.$list.width(),i.listHeight=i.$list.height(),i.options.vertical===!1&&i.options.variableWidth===!1?(i.slideWidth=Math.ceil(i.listWidth/i.options.slidesToShow),i.$slideTrack.width(Math.ceil(i.slideWidth*i.$slideTrack.children(".slick-slide").length))):i.options.variableWidth===!0?i.$slideTrack.width(5e3*i.slideCount):(i.slideWidth=Math.ceil(i.listWidth),i.$slideTrack.height(Math.ceil(i.$slides.first().outerHeight(!0)*i.$slideTrack.children(".slick-slide").length)));var e=i.$slides.first().outerWidth(!0)-i.$slides.first().width();i.options.variableWidth===!1&&i.$slideTrack.children(".slick-slide").width(i.slideWidth-e)},e.prototype.setFade=function(){var e,t=this;t.$slides.each(function(o,s){e=t.slideWidth*o*-1,t.options.rtl===!0?i(s).css({position:"relative",right:e,top:0,zIndex:t.options.zIndex-2,opacity:0}):i(s).css({position:"relative",left:e,top:0,zIndex:t.options.zIndex-2,opacity:0})}),t.$slides.eq(t.currentSlide).css({zIndex:t.options.zIndex-1,opacity:1})},e.prototype.setHeight=function(){var i=this;if(1===i.options.slidesToShow&&i.options.adaptiveHeight===!0&&i.options.vertical===!1){var e=i.$slides.eq(i.currentSlide).outerHeight(!0);i.$list.css("height",e)}},e.prototype.setOption=e.prototype.slickSetOption=function(){var e,t,o,s,n,r=this,l=!1;if("object"===i.type(arguments[0])?(o=arguments[0],l=arguments[1],n="multiple"):"string"===i.type(arguments[0])&&(o=arguments[0],s=arguments[1],l=arguments[2],"responsive"===arguments[0]&&"array"===i.type(arguments[1])?n="responsive":"undefined"!=typeof arguments[1]&&(n="single")),"single"===n)r.options[o]=s;else if("multiple"===n)i.each(o,function(i,e){r.options[i]=e});else if("responsive"===n)for(t in s)if("array"!==i.type(r.options.responsive))r.options.responsive=[s[t]];else{for(e=r.options.responsive.length-1;e>=0;)r.options.responsive[e].breakpoint===s[t].breakpoint&&r.options.responsive.splice(e,1),e--;r.options.responsive.push(s[t])}l&&(r.unload(),r.reinit())},e.prototype.setPosition=function(){var i=this;i.setDimensions(),i.setHeight(),i.options.fade===!1?i.setCSS(i.getLeft(i.currentSlide)):i.setFade(),i.$slider.trigger("setPosition",[i])},e.prototype.setProps=function(){var i=this,e=document.body.style;i.positionProp=i.options.vertical===!0?"top":"left",
+"top"===i.positionProp?i.$slider.addClass("slick-vertical"):i.$slider.removeClass("slick-vertical"),void 0===e.WebkitTransition&&void 0===e.MozTransition&&void 0===e.msTransition||i.options.useCSS===!0&&(i.cssTransitions=!0),i.options.fade&&("number"==typeof i.options.zIndex?i.options.zIndex<3&&(i.options.zIndex=3):i.options.zIndex=i.defaults.zIndex),void 0!==e.OTransform&&(i.animType="OTransform",i.transformType="-o-transform",i.transitionType="OTransition",void 0===e.perspectiveProperty&&void 0===e.webkitPerspective&&(i.animType=!1)),void 0!==e.MozTransform&&(i.animType="MozTransform",i.transformType="-moz-transform",i.transitionType="MozTransition",void 0===e.perspectiveProperty&&void 0===e.MozPerspective&&(i.animType=!1)),void 0!==e.webkitTransform&&(i.animType="webkitTransform",i.transformType="-webkit-transform",i.transitionType="webkitTransition",void 0===e.perspectiveProperty&&void 0===e.webkitPerspective&&(i.animType=!1)),void 0!==e.msTransform&&(i.animType="msTransform",i.transformType="-ms-transform",i.transitionType="msTransition",void 0===e.msTransform&&(i.animType=!1)),void 0!==e.transform&&i.animType!==!1&&(i.animType="transform",i.transformType="transform",i.transitionType="transition"),i.transformsEnabled=i.options.useTransform&&null!==i.animType&&i.animType!==!1},e.prototype.setSlideClasses=function(i){var e,t,o,s,n=this;if(t=n.$slider.find(".slick-slide").removeClass("slick-active slick-center slick-current").attr("aria-hidden","true"),n.$slides.eq(i).addClass("slick-current"),n.options.centerMode===!0){var r=n.options.slidesToShow%2===0?1:0;e=Math.floor(n.options.slidesToShow/2),n.options.infinite===!0&&(i>=e&&i<=n.slideCount-1-e?n.$slides.slice(i-e+r,i+e+1).addClass("slick-active").attr("aria-hidden","false"):(o=n.options.slidesToShow+i,t.slice(o-e+1+r,o+e+2).addClass("slick-active").attr("aria-hidden","false")),0===i?t.eq(t.length-1-n.options.slidesToShow).addClass("slick-center"):i===n.slideCount-1&&t.eq(n.options.slidesToShow).addClass("slick-center")),n.$slides.eq(i).addClass("slick-center")}else i>=0&&i<=n.slideCount-n.options.slidesToShow?n.$slides.slice(i,i+n.options.slidesToShow).addClass("slick-active").attr("aria-hidden","false"):t.length<=n.options.slidesToShow?t.addClass("slick-active").attr("aria-hidden","false"):(s=n.slideCount%n.options.slidesToShow,o=n.options.infinite===!0?n.options.slidesToShow+i:i,n.options.slidesToShow==n.options.slidesToScroll&&n.slideCount-i<n.options.slidesToShow?t.slice(o-(n.options.slidesToShow-s),o+s).addClass("slick-active").attr("aria-hidden","false"):t.slice(o,o+n.options.slidesToShow).addClass("slick-active").attr("aria-hidden","false"));"ondemand"!==n.options.lazyLoad&&"anticipated"!==n.options.lazyLoad||n.lazyLoad()},e.prototype.setupInfinite=function(){var e,t,o,s=this;if(s.options.fade===!0&&(s.options.centerMode=!1),s.options.infinite===!0&&s.options.fade===!1&&(t=null,s.slideCount>s.options.slidesToShow)){for(o=s.options.centerMode===!0?s.options.slidesToShow+1:s.options.slidesToShow,e=s.slideCount;e>s.slideCount-o;e-=1)t=e-1,i(s.$slides[t]).clone(!0).attr("id","").attr("data-slick-index",t-s.slideCount).prependTo(s.$slideTrack).addClass("slick-cloned");for(e=0;e<o+s.slideCount;e+=1)t=e,i(s.$slides[t]).clone(!0).attr("id","").attr("data-slick-index",t+s.slideCount).appendTo(s.$slideTrack).addClass("slick-cloned");s.$slideTrack.find(".slick-cloned").find("[id]").each(function(){i(this).attr("id","")})}},e.prototype.interrupt=function(i){var e=this;i||e.autoPlay(),e.interrupted=i},e.prototype.selectHandler=function(e){var t=this,o=i(e.target).is(".slick-slide")?i(e.target):i(e.target).parents(".slick-slide"),s=parseInt(o.attr("data-slick-index"));return s||(s=0),t.slideCount<=t.options.slidesToShow?void t.slideHandler(s,!1,!0):void t.slideHandler(s)},e.prototype.slideHandler=function(i,e,t){var o,s,n,r,l,d=null,a=this;if(e=e||!1,!(a.animating===!0&&a.options.waitForAnimate===!0||a.options.fade===!0&&a.currentSlide===i))return e===!1&&a.asNavFor(i),o=i,d=a.getLeft(o),r=a.getLeft(a.currentSlide),a.currentLeft=null===a.swipeLeft?r:a.swipeLeft,a.options.infinite===!1&&a.options.centerMode===!1&&(i<0||i>a.getDotCount()*a.options.slidesToScroll)?void(a.options.fade===!1&&(o=a.currentSlide,t!==!0&&a.slideCount>a.options.slidesToShow?a.animateSlide(r,function(){a.postSlide(o)}):a.postSlide(o))):a.options.infinite===!1&&a.options.centerMode===!0&&(i<0||i>a.slideCount-a.options.slidesToScroll)?void(a.options.fade===!1&&(o=a.currentSlide,t!==!0&&a.slideCount>a.options.slidesToShow?a.animateSlide(r,function(){a.postSlide(o)}):a.postSlide(o))):(a.options.autoplay&&clearInterval(a.autoPlayTimer),s=o<0?a.slideCount%a.options.slidesToScroll!==0?a.slideCount-a.slideCount%a.options.slidesToScroll:a.slideCount+o:o>=a.slideCount?a.slideCount%a.options.slidesToScroll!==0?0:o-a.slideCount:o,a.animating=!0,a.$slider.trigger("beforeChange",[a,a.currentSlide,s]),n=a.currentSlide,a.currentSlide=s,a.setSlideClasses(a.currentSlide),a.options.asNavFor&&(l=a.getNavTarget(),l=l.slick("getSlick"),l.slideCount<=l.options.slidesToShow&&l.setSlideClasses(a.currentSlide)),a.updateDots(),a.updateArrows(),a.options.fade===!0?(t!==!0?(a.fadeSlideOut(n),a.fadeSlide(s,function(){a.postSlide(s)})):a.postSlide(s),void a.animateHeight()):void(t!==!0&&a.slideCount>a.options.slidesToShow?a.animateSlide(d,function(){a.postSlide(s)}):a.postSlide(s)))},e.prototype.startLoad=function(){var i=this;i.options.arrows===!0&&i.slideCount>i.options.slidesToShow&&(i.$prevArrow.hide(),i.$nextArrow.hide()),i.options.dots===!0&&i.slideCount>i.options.slidesToShow&&i.$dots.hide(),i.$slider.addClass("slick-loading")},e.prototype.swipeDirection=function(){var i,e,t,o,s=this;return i=s.touchObject.startX-s.touchObject.curX,e=s.touchObject.startY-s.touchObject.curY,t=Math.atan2(e,i),o=Math.round(180*t/Math.PI),o<0&&(o=360-Math.abs(o)),o<=45&&o>=0?s.options.rtl===!1?"left":"right":o<=360&&o>=315?s.options.rtl===!1?"left":"right":o>=135&&o<=225?s.options.rtl===!1?"right":"left":s.options.verticalSwiping===!0?o>=35&&o<=135?"down":"up":"vertical"},e.prototype.swipeEnd=function(i){var e,t,o=this;if(o.dragging=!1,o.swiping=!1,o.scrolling)return o.scrolling=!1,!1;if(o.interrupted=!1,o.shouldClick=!(o.touchObject.swipeLength>10),void 0===o.touchObject.curX)return!1;if(o.touchObject.edgeHit===!0&&o.$slider.trigger("edge",[o,o.swipeDirection()]),o.touchObject.swipeLength>=o.touchObject.minSwipe){switch(t=o.swipeDirection()){case"left":case"down":e=o.options.swipeToSlide?o.checkNavigable(o.currentSlide+o.getSlideCount()):o.currentSlide+o.getSlideCount(),o.currentDirection=0;break;case"right":case"up":e=o.options.swipeToSlide?o.checkNavigable(o.currentSlide-o.getSlideCount()):o.currentSlide-o.getSlideCount(),o.currentDirection=1}"vertical"!=t&&(o.slideHandler(e),o.touchObject={},o.$slider.trigger("swipe",[o,t]))}else o.touchObject.startX!==o.touchObject.curX&&(o.slideHandler(o.currentSlide),o.touchObject={})},e.prototype.swipeHandler=function(i){var e=this;if(!(e.options.swipe===!1||"ontouchend"in document&&e.options.swipe===!1||e.options.draggable===!1&&i.type.indexOf("mouse")!==-1))switch(e.touchObject.fingerCount=i.originalEvent&&void 0!==i.originalEvent.touches?i.originalEvent.touches.length:1,e.touchObject.minSwipe=e.listWidth/e.options.touchThreshold,e.options.verticalSwiping===!0&&(e.touchObject.minSwipe=e.listHeight/e.options.touchThreshold),i.data.action){case"start":e.swipeStart(i);break;case"move":e.swipeMove(i);break;case"end":e.swipeEnd(i)}},e.prototype.swipeMove=function(i){var e,t,o,s,n,r,l=this;return n=void 0!==i.originalEvent?i.originalEvent.touches:null,!(!l.dragging||l.scrolling||n&&1!==n.length)&&(e=l.getLeft(l.currentSlide),l.touchObject.curX=void 0!==n?n[0].pageX:i.clientX,l.touchObject.curY=void 0!==n?n[0].pageY:i.clientY,l.touchObject.swipeLength=Math.round(Math.sqrt(Math.pow(l.touchObject.curX-l.touchObject.startX,2))),r=Math.round(Math.sqrt(Math.pow(l.touchObject.curY-l.touchObject.startY,2))),!l.options.verticalSwiping&&!l.swiping&&r>4?(l.scrolling=!0,!1):(l.options.verticalSwiping===!0&&(l.touchObject.swipeLength=r),t=l.swipeDirection(),void 0!==i.originalEvent&&l.touchObject.swipeLength>4&&(l.swiping=!0,i.preventDefault()),s=(l.options.rtl===!1?1:-1)*(l.touchObject.curX>l.touchObject.startX?1:-1),l.options.verticalSwiping===!0&&(s=l.touchObject.curY>l.touchObject.startY?1:-1),o=l.touchObject.swipeLength,l.touchObject.edgeHit=!1,l.options.infinite===!1&&(0===l.currentSlide&&"right"===t||l.currentSlide>=l.getDotCount()&&"left"===t)&&(o=l.touchObject.swipeLength*l.options.edgeFriction,l.touchObject.edgeHit=!0),l.options.vertical===!1?l.swipeLeft=e+o*s:l.swipeLeft=e+o*(l.$list.height()/l.listWidth)*s,l.options.verticalSwiping===!0&&(l.swipeLeft=e+o*s),l.options.fade!==!0&&l.options.touchMove!==!1&&(l.animating===!0?(l.swipeLeft=null,!1):void l.setCSS(l.swipeLeft))))},e.prototype.swipeStart=function(i){var e,t=this;return t.interrupted=!0,1!==t.touchObject.fingerCount||t.slideCount<=t.options.slidesToShow?(t.touchObject={},!1):(void 0!==i.originalEvent&&void 0!==i.originalEvent.touches&&(e=i.originalEvent.touches[0]),t.touchObject.startX=t.touchObject.curX=void 0!==e?e.pageX:i.clientX,t.touchObject.startY=t.touchObject.curY=void 0!==e?e.pageY:i.clientY,void(t.dragging=!0))},e.prototype.unfilterSlides=e.prototype.slickUnfilter=function(){var i=this;null!==i.$slidesCache&&(i.unload(),i.$slideTrack.children(this.options.slide).detach(),i.$slidesCache.appendTo(i.$slideTrack),i.reinit())},e.prototype.unload=function(){var e=this;i(".slick-cloned",e.$slider).remove(),e.$dots&&e.$dots.remove(),e.$prevArrow&&e.htmlExpr.test(e.options.prevArrow)&&e.$prevArrow.remove(),e.$nextArrow&&e.htmlExpr.test(e.options.nextArrow)&&e.$nextArrow.remove(),e.$slides.removeClass("slick-slide slick-active slick-visible slick-current").attr("aria-hidden","true").css("width","")},e.prototype.unslick=function(i){var e=this;e.$slider.trigger("unslick",[e,i]),e.destroy()},e.prototype.updateArrows=function(){var i,e=this;i=Math.floor(e.options.slidesToShow/2),e.options.arrows===!0&&e.slideCount>e.options.slidesToShow&&!e.options.infinite&&(e.$prevArrow.removeClass("slick-disabled").attr("aria-disabled","false"),e.$nextArrow.removeClass("slick-disabled").attr("aria-disabled","false"),0===e.currentSlide?(e.$prevArrow.addClass("slick-disabled").attr("aria-disabled","true"),e.$nextArrow.removeClass("slick-disabled").attr("aria-disabled","false")):e.currentSlide>=e.slideCount-e.options.slidesToShow&&e.options.centerMode===!1?(e.$nextArrow.addClass("slick-disabled").attr("aria-disabled","true"),e.$prevArrow.removeClass("slick-disabled").attr("aria-disabled","false")):e.currentSlide>=e.slideCount-1&&e.options.centerMode===!0&&(e.$nextArrow.addClass("slick-disabled").attr("aria-disabled","true"),e.$prevArrow.removeClass("slick-disabled").attr("aria-disabled","false")))},e.prototype.updateDots=function(){var i=this;null!==i.$dots&&(i.$dots.find("li").removeClass("slick-active").end(),i.$dots.find("li").eq(Math.floor(i.currentSlide/i.options.slidesToScroll)).addClass("slick-active"))},e.prototype.visibility=function(){var i=this;i.options.autoplay&&(document[i.hidden]?i.interrupted=!0:i.interrupted=!1)},i.fn.slick=function(){var i,t,o=this,s=arguments[0],n=Array.prototype.slice.call(arguments,1),r=o.length;for(i=0;i<r;i++)if("object"==typeof s||"undefined"==typeof s?o[i].slick=new e(o[i],s):t=o[i].slick[s].apply(o[i].slick,n),"undefined"!=typeof t)return t;return o}});
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/category/view/description.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/category/view/description.phtml
index 4211b61a3a1..b163c757a28 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/category/view/description.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/category/view/description.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 ?>
 <?php
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml
index 88f64939c13..c57555544ab 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/attribute_list.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml
index b07d088c46e..0d7ebe92e5c 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/view/section_wrapper.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
index 6b91b575dad..78bfcccad1f 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
@@ -1,15 +1,23 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 use Magento\Framework\App\Action\Action;
 
 // phpcs:disable Magento2.Templates.ThisInTemplate
+// phpcs:disable Generic.Files.LineLength.TooLong
 
 /** @var \Magento\CatalogWidget\Block\Product\ProductsList $block */
 ?>
-<?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->getSize())) : ?>
+<?php
+/**
+ * Product carousel widget template
+ *
+ * @var \Magento\Framework\Escaper $escaper
+ */
+?>
+<?php if ($exist = ($block->getProductCollection() && $block->getProductCollection()->count())): ?>
     <?php
     $type = 'widget-product-carousel';
 
@@ -23,21 +31,21 @@ use Magento\Framework\App\Action\Action;
     ?>
     <ol class="product-items <?= /* @noEscape */ $type ?>">
         <?php $iterator = 1; ?>
-        <?php foreach ($items as $_item) : ?>
+        <?php foreach ($items as $_item): ?>
             <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
             <div class="product-item-info">
-                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                <a href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                     <?= $block->getImage($_item, $image)->toHtml() ?>
                 </a>
                 <div class="product-item-details">
                     <strong class="product-item-name">
-                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                        <a title="<?= $escaper->escapeHtml($_item->getName()) ?>"
+                           href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>"
                            class="product-item-link">
-                            <?= $block->escapeHtml($_item->getName()) ?>
+                            <?= $escaper->escapeHtml($_item->getName()) ?>
                         </a>
                     </strong>
-                    <?php if ($templateType) : ?>
+                    <?php if ($templateType): ?>
                         <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                     <?php endif; ?>
 
@@ -45,44 +53,58 @@ use Magento\Framework\App\Action\Action;
 
                     <?= $block->getProductDetailsHtml($_item) ?>
 
-                    <?php if ($showWishlist || $showCompare || $showCart) : ?>
+                    <?php if ($showWishlist || $showCompare || $showCart): ?>
                         <div class="product-item-inner">
                             <div class="product-item-actions">
-                                <?php if ($showCart) : ?>
+                                <?php if ($showCart): ?>
                                     <div class="actions-primary">
-                                        <?php if ($_item->isSaleable()) : ?>
+                                        <?php if ($_item->isSaleable()): ?>
                                             <?php $postParams = $block->getAddToCartPostParams($_item); ?>
-                                            <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= $block->escapeUrl($postParams['action']) ?>" method="post">
-                                                <input type="hidden" name="product" value="<?= $block->escapeHtmlAttr($postParams['data']['product']) ?>">
+                                            <form data-role="tocart-form" data-product-sku="<?= $escaper->escapeHtml($_item->getSku()) ?>" action="<?= $escaper->escapeUrl($postParams['action']) ?>" method="post">
+                                                <?php foreach ($postParams['data']['options'] as $optionItem): ?>
+                                                    <input type="hidden"
+                                                           name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
+                                                           value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
+                                                <?php endforeach; ?>
+                                                <input type="hidden" name="product" value="<?= $escaper->escapeHtmlAttr($postParams['data']['product']) ?>">
                                                 <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                                 <?= $block->getBlockHtml('formkey') ?>
                                                 <button type="submit"
-                                                        title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                                                        title="<?= $escaper->escapeHtml(__('Add to Cart')) ?>"
                                                         class="action tocart primary">
-                                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                    <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                 </button>
                                             </form>
-                                        <?php else : ?>
-                                            <?php if ($_item->getIsSalable()) : ?>
-                                                <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
-                                            <?php else : ?>
-                                                <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                            <script type="text/x-magento-init">
+                                            {
+                                                "[data-role=tocart-form], .form.map.checkout": {
+                                                    "catalogAddToCart": {
+                                                        "product_sku": "<?= $escaper->escapeJs($_item->getSku()); ?>"
+                                                    }
+                                                }
+                                            }
+                                            </script>
+                                        <?php else: ?>
+                                            <?php if ($_item->getIsSalable()): ?>
+                                                <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
+                                            <?php else: ?>
+                                                <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
                                             <?php endif; ?>
                                         <?php endif; ?>
                                     </div>
                                 <?php endif; ?>
-                                <?php if ($showWishlist || $showCompare) : ?>
+                                <?php if ($showWishlist || $showCompare): ?>
                                     <div class="actions-secondary" data-role="add-to-links">
-                                        <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist) : ?>
+                                        <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist): ?>
                                             <a href="#"
-                                               data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                               data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $escaper->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                <span><?= $escaper->escapeHtml(__('Add to Wish List')) ?></span>
                                             </a>
                                         <?php endif; ?>
-                                        <?php if ($block->getAddToCompareUrl() && $showCompare) : ?>
+                                        <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                             <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-                                            <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                            <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $escaper->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                <span><?= $escaper->escapeHtml(__('Add to Compare')) ?></span>
                                             </a>
                                         <?php endif; ?>
                                     </div>
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/widget/link_href.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/widget/link_href.phtml
index f6bbbe2c202..8275c60f3c4 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/widget/link_href.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/widget/link_href.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 // @codingStandardsIgnoreFile
diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/widget_initializer.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/widget_initializer.phtml
index 3f7a632c091..2ddd337cb1e 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/widget_initializer.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/widget_initializer.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /** @var \Magento\PageBuilder\Block\WidgetInitializer $block */
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/_icons.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/_icons.less
index 38313c9f140..54721a4d6e7 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/_icons.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/_icons.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Common
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/_layout.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/_layout.less
index 4c8314197ad..019e1633ab0 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/_layout.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/_layout.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Product -- Full Width
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less
index 75d7b7f0fce..678ee1770d5 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/_module.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 @icons-pagebuilder__font-name: 'pagebuilder-font';
 @icons-pagebuilder__font-path: '@{baseDir}Magento_PageBuilder/fonts/pagebuilder-icons/pagebuilder-icons';
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/_import.less
index 0cdbc34cb25..04c8e9be737 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all content types less files
@@ -13,6 +13,7 @@
 @import 'button-item/_import.less';
 @import 'column/_import.less';
 @import 'column-group/_import.less';
+@import 'column-line/_import.less';
 @import 'heading/_import.less';
 @import 'html/_import.less';
 @import 'image/_import.less';
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-center.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-center.less
index 74f3d17b233..b0621a7564b 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-center.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-center.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Collage center appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-left.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-left.less
index ae1cc30fc92..d80f7679156 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-left.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-left.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Collage left appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-right.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-right.less
index b5daa61b5b1..c445d60bd5d 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-right.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_collage-right.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Collage right appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_default.less
index fc9af8c6e7f..65a951de287 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_import.less
index 45a7b258050..bb398dfbc27 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_poster.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_poster.less
index bb1916276ee..a918314bdae 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_poster.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/banner/_poster.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Poster appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_default.less
index 3be1ffa5509..697656363fa 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2019 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_import.less
index 5dcbad8d6e6..59fc290f7de 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/block/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2019 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_default.less
index 80de45c4758..6c94d37a61a 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/button-item/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_default.less
index 4f316a56069..b509a142afa 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/buttons/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_default.less
index a56d88287de..7235deb2b78 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_default.less
@@ -1,13 +1,9 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
+
 
-& when (@media-common = true) {
-    .pagebuilder-column-group {
-        display: flex;
-    }
-}
 
 //
 //  Mobile (style-m.css)
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-group/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-line/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-line/_default.less
new file mode 100644
index 00000000000..53556469dd7
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-line/_default.less
@@ -0,0 +1,14 @@
+// /**
+// * Copyright 2022 Adobe
+// * All Rights Reserved.
+// */
+
+//
+//  Mobile (style-m.css)
+//  _____________________________________________
+
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    .pagebuilder-column-line {
+        flex-wrap: wrap;
+    }
+}
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-line/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-line/_import.less
new file mode 100644
index 00000000000..bc6c6e0e821
--- /dev/null
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column-line/_import.less
@@ -0,0 +1,10 @@
+// /**
+// * Copyright 2022 Adobe
+// * All Rights Reserved.
+// */
+
+//
+//  _import imports all appearance less files
+//  _____________________________________________
+
+@import './_default.less';
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_default.less
index 37f5c391561..20b0feabc59 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/column/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_default.less
index 1cb685adad4..8acbb91824f 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/heading/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_default.less
index 532fd9b0fc1..92b56dccd4f 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/html/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_default.less
index d9f3eaf8d1e..2b5320df287 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/image/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_default.less
index d2adcb66048..9538ac04dca 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/map/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_carousel.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_carousel.less
index 2ab144f0363..473b36316e4 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_carousel.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_carousel.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2019 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_default.less
index 3dae821e404..4ac83c463ca 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_import.less
index 74310a87372..981e7a042e4 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/products/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_contained.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_contained.less
index 460ed50a67d..a2d13acd593 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_contained.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_contained.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Contained row appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-bleed.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-bleed.less
index 29bd4d84c45..383d3983652 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-bleed.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-bleed.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Full Bleed row appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-width.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-width.less
index 04423e8ee03..6fa716955a7 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-width.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_full-width.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Full Width row appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_import.less
index 683cf5f5253..c3a11cf4b1f 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/row/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-center.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-center.less
index b788d7ade04..c6ea4b8cf2b 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-center.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-center.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Collage center appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-left.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-left.less
index 5b47e92d9bc..b39bf071a86 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-left.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-left.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Collage left appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-right.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-right.less
index af4ab78878c..6c285bc6098 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-right.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_collage-right.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Collage right appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less
index 619cdf66079..ec3a41da3fe 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_import.less
index 45a7b258050..bb398dfbc27 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_poster.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_poster.less
index 6abc570f100..c7b700973e1 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_poster.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slide/_poster.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Poster appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_default.less
index 77b31f606eb..1df7d3debc4 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
@@ -27,14 +27,13 @@
                 width: 100%;
             }
         }
-    }
-
-    a.button {
-        -moz-appearance: button;
-        -webkit-appearance: button;
-        appearance: button;
-        color: initial;
-        padding: 10px;
-        text-decoration: none;
+        a.button {
+            -moz-appearance: button;
+            -webkit-appearance: button;
+            appearance: button;
+            color: initial;
+            padding: 10px;
+            text-decoration: none;
+        }
     }
 }
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/slider/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_default.less
index 58a3c852b47..b3b70fc593d 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/tabs/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_default.less
index 7197bcddcd1..01b72ab2cc2 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/text/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_default.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_default.less
index fb4edfe82a6..afc9e2d0566 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_default.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_default.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  Default appearance styles
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_import.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_import.less
index 5dcbad8d6e6..d2bc3e94402 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_import.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/content-type/video/_import.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 //
 //  _import imports all appearance less files
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/css/source/slick/_slick.less b/app/code/Magento/PageBuilder/view/frontend/web/css/source/slick/_slick.less
index 270926b3cc2..88f709bdcc1 100755
--- a/app/code/Magento/PageBuilder/view/frontend/web/css/source/slick/_slick.less
+++ b/app/code/Magento/PageBuilder/view/frontend/web/css/source/slick/_slick.less
@@ -1,7 +1,7 @@
 // /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+// * Copyright 2018 Adobe
+// * All Rights Reserved.
+// */
 
 @b3: #b3b3b3;
 @color-pagebuilder-darkest-gray: #1c1918;
diff --git a/app/code/Magento/PageBuilder/view/frontend/web/fonts/pagebuilder-icons/README.md b/app/code/Magento/PageBuilder/view/frontend/web/fonts/pagebuilder-icons/README.md
index bf5d5ca03e2..03760ac6368 100644
--- a/app/code/Magento/PageBuilder/view/frontend/web/fonts/pagebuilder-icons/README.md
+++ b/app/code/Magento/PageBuilder/view/frontend/web/fonts/pagebuilder-icons/README.md
@@ -1 +1 @@
-This font was generated from the https://github.com/magento-ux/cms-icons repository.
\ No newline at end of file
+This font was generated from the https://github.com/magento-ux/cms-icons repository.
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/README.md b/app/code/Magento/PageBuilderAdminAnalytics/README.md
index ec750904db1..e2dea6112a9 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/README.md
+++ b/app/code/Magento/PageBuilderAdminAnalytics/README.md
@@ -1,4 +1,3 @@
 # Magento_PageBuilderAdminAnalytics module
 
 The Magento_PageBuilderAdminAnalytics module tracks Page Builder information through AdminAnalytics.
-
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/composer.json b/app/code/Magento/PageBuilderAdminAnalytics/composer.json
index aa7b11e4b5e..9adde8938d3 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/composer.json
+++ b/app/code/Magento/PageBuilderAdminAnalytics/composer.json
@@ -6,7 +6,7 @@
     },
     "require": {
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "suggest": {
         "magento/module-admin-analytics": "*",
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/etc/module.xml b/app/code/Magento/PageBuilderAdminAnalytics/etc/module.xml
index 40eb18b54c0..c2d7cf198ba 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/etc/module.xml
+++ b/app/code/Magento/PageBuilderAdminAnalytics/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/registration.php b/app/code/Magento/PageBuilderAdminAnalytics/registration.php
index edf149ef83b..7ca8d1f89c6 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/registration.php
+++ b/app/code/Magento/PageBuilderAdminAnalytics/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 use \Magento\Framework\Component\ComponentRegistrar;
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/requirejs-config.js b/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/requirejs-config.js
index cf72ef7fcf2..fd23d9dea00 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/requirejs-config.js
+++ b/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/requirejs-config.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 var config = {
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/event-builder.js b/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/event-builder.js
index 65056a91414..81a8018a369 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/event-builder.js
+++ b/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/event-builder.js
@@ -1,10 +1,10 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 define(['underscore'], function (_) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     return {
 
@@ -25,28 +25,23 @@ define(['underscore'], function (_) {
             }
 
             switch (name) {
-                case 'contentType:duplicateAfter':
-                    action = 'duplicate';
-                    break;
-
-                case 'contentType:removeAfter':
-                    action = 'remove';
-                    break;
-
-                case 'contentType:createAfter':
-                    action = 'create';
-                    break;
-
-                case 'contentType:editBefore':
-                    action = 'edit';
-                    break;
-
-                case 'contentType:visibilityAfter':
-                    action = args.visibility ? 'show' : 'hide';
-                    break;
-
-                default:
-                    break;
+            case 'contentType:duplicateAfter':
+                action = 'duplicate';
+                break;
+            case 'contentType:removeAfter':
+                action = 'remove';
+                break;
+            case 'contentType:createAfter':
+                action = 'create';
+                break;
+            case 'contentType:editBefore':
+                action = 'edit';
+                break;
+            case 'contentType:visibilityAfter':
+                action = args.visibility ? 'show' : 'hide';
+                break;
+            default:
+                break;
             }
 
             if (!_.isUndefined(args.contentType)) {
diff --git a/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/events-mixin.js b/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/events-mixin.js
index a5e16218dc0..00bcadf4c33 100644
--- a/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/events-mixin.js
+++ b/app/code/Magento/PageBuilderAdminAnalytics/view/adminhtml/web/js/page-builder/events-mixin.js
@@ -1,11 +1,11 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 define(['underscore', 'Magento_PageBuilderAdminAnalytics/js/page-builder/event-builder'],
     function (_, EventBuilder) {
-        'use strict';
+        'use strict'; // eslint-disable-line strict
 
         return function (target) {
             var originalTarget = target.trigger,
diff --git a/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php b/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php
index f98be6e0a20..64ef3dfbf97 100644
--- a/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php
+++ b/app/code/Magento/PageBuilderAnalytics/Model/ContentTypeUsageReportProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -80,6 +80,7 @@ public function getReport($name) : \IteratorIterator
     {
         $query = $this->queryFactory->create($name);
 
+        $reportData = [];
         // Prepare our type count data
         $typeCounts = [];
         $contentTypes = $this->config->getContentTypes();
@@ -102,7 +103,7 @@ public function getReport($name) : \IteratorIterator
                     foreach ($contentTypes as $type) {
                         // Count the amount of content types within the content
                         $rowContent = $row['content'] ?? '';
-                        if (strlen($rowContent) > 0) {
+                        if ($rowContent !== null && strlen($rowContent) > 0) {
                             $typeCounts[$type['name']] += substr_count(
                                 $rowContent,
                                 'data-content-type="' . $type['name'] . '"'
diff --git a/app/code/Magento/PageBuilderAnalytics/README.md b/app/code/Magento/PageBuilderAnalytics/README.md
index bb9b22714b8..1eb95041ee3 100644
--- a/app/code/Magento/PageBuilderAnalytics/README.md
+++ b/app/code/Magento/PageBuilderAnalytics/README.md
@@ -1,3 +1,3 @@
 # Magento_PageBuilderAnalytics module
 
-The Magento_PageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://devdocs.magento.com/guides/v2.4/advanced-reporting/modules.html).
+The Magento_PageBuilderAnalytics module configures data definitions for a data collection related to the PageBuilder module entities to be used in [Advanced Reporting](https://developer.adobe.com/commerce/php/development/advanced-reporting/modules/).
diff --git a/app/code/Magento/PageBuilderAnalytics/composer.json b/app/code/Magento/PageBuilderAnalytics/composer.json
index 61f468cb4e8..73ba41dbb77 100644
--- a/app/code/Magento/PageBuilderAnalytics/composer.json
+++ b/app/code/Magento/PageBuilderAnalytics/composer.json
@@ -5,7 +5,7 @@
         "magento/module-analytics": "*",
         "magento/module-page-builder": "*",
         "magento/framework": "*",
-        "php": "~7.4.0||~8.1.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "type": "magento2-module",
     "license": [
diff --git a/app/code/Magento/PageBuilderAnalytics/etc/di.xml b/app/code/Magento/PageBuilderAnalytics/etc/di.xml
index ea3dfd89cdb..c1b9bfd6055 100644
--- a/app/code/Magento/PageBuilderAnalytics/etc/di.xml
+++ b/app/code/Magento/PageBuilderAnalytics/etc/di.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
diff --git a/app/code/Magento/PageBuilderAnalytics/etc/module.xml b/app/code/Magento/PageBuilderAnalytics/etc/module.xml
index 37d3842990e..13588c6c51a 100644
--- a/app/code/Magento/PageBuilderAnalytics/etc/module.xml
+++ b/app/code/Magento/PageBuilderAnalytics/etc/module.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
diff --git a/app/code/Magento/PageBuilderAnalytics/registration.php b/app/code/Magento/PageBuilderAnalytics/registration.php
index b8543362f84..9cbc6cf7059 100644
--- a/app/code/Magento/PageBuilderAnalytics/registration.php
+++ b/app/code/Magento/PageBuilderAnalytics/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/app/code/Magento/PageBuilderImageAttribute/README.md b/app/code/Magento/PageBuilderImageAttribute/README.md
new file mode 100644
index 00000000000..97f21cc9616
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/README.md
@@ -0,0 +1,2 @@
+# Magento_PageBuilderImageAttribute module
+
diff --git a/app/code/Magento/PageBuilderImageAttribute/Test/Mftf/Data/ImageData.xml b/app/code/Magento/PageBuilderImageAttribute/Test/Mftf/Data/ImageData.xml
new file mode 100644
index 00000000000..585ee700b97
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/Test/Mftf/Data/ImageData.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <!-- Image Width -->
+    <entity name="PageBuilderImageWidthProperty" type="pagebuilder_width_property">
+        <data key="name">Width</data>
+        <data key="section">general</data>
+        <data key="fieldName">image_attribute_width</data>
+        <data key="value">123</data>
+    </entity>
+    <!-- Image Height -->
+    <entity name="PageBuilderImageHeightProperty" type="pagebuilder_Height_property">
+        <data key="name">Height</data>
+        <data key="section">general</data>
+        <data key="fieldName">image_attribute_height</data>
+        <data key="value">123</data>
+    </entity>
+    <!-- Mobile Image Width -->
+    <entity name="PageBuilderMobileImageWidthProperty" type="pagebuilder_mobile_width_property">
+        <data key="name">Width</data>
+        <data key="section">general</data>
+        <data key="fieldName">mobile_image_attribute_width</data>
+        <data key="value">123</data>
+    </entity>
+    <!-- Mobile Image Height -->
+    <entity name="PageBuilderMobileImageHeightProperty" type="pagebuilder_mobile_Height_property">
+        <data key="name">Height</data>
+        <data key="section">general</data>
+        <data key="fieldName">mobile_image_attribute_height</data>
+        <data key="value">123</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/PageBuilderImageAttribute/composer.json b/app/code/Magento/PageBuilderImageAttribute/composer.json
new file mode 100644
index 00000000000..cef0206c953
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "magento/module-page-builder-image-attribute",
+    "description": "Width & Height attribute - Pagebuilder image",
+    "require": {
+        "magento/framework": "*",
+        "php": "~8.2.0||~8.3.0||~8.4.0"
+    },
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "autoload": {
+        "files": [
+            "registration.php"
+        ],
+        "psr-4": {
+            "Magento\\PageBuilderImageAttribute\\": ""
+        }
+    }
+}
diff --git a/app/code/Magento/PageBuilderImageAttribute/etc/module.xml b/app/code/Magento/PageBuilderImageAttribute/etc/module.xml
new file mode 100644
index 00000000000..b01d6b458ba
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/etc/module.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_PageBuilderImageAttribute" setup_version="1.0.0">
+        <sequence>
+            <module name="Magento_PageBuilder" />
+        </sequence>
+    </module>
+</config>
diff --git a/app/code/Magento/PageBuilderImageAttribute/registration.php b/app/code/Magento/PageBuilderImageAttribute/registration.php
new file mode 100644
index 00000000000..f67b69b6abe
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/registration.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_PageBuilderImageAttribute', __DIR__);
diff --git a/app/code/Magento/PageBuilderImageAttribute/view/adminhtml/pagebuilder/content_type/image.xml b/app/code/Magento/PageBuilderImageAttribute/view/adminhtml/pagebuilder/content_type/image.xml
new file mode 100644
index 00000000000..8040551d96b
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/view/adminhtml/pagebuilder/content_type/image.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_PageBuilder:etc/content_type.xsd">
+    <type name="image"
+          label="Image"
+          component="Magento_PageBuilder/js/content-type"
+          preview_component="Magento_PageBuilder/js/content-type/image/preview"
+          form="pagebuilder_image_form"
+          menu_section="media"
+          icon="icon-pagebuilder-image"
+          sortOrder="1"
+          translate="label">
+        <children default_policy="deny"/>
+        <appearances>
+            <appearance default="true"
+                        name="full-width"
+                        preview_template="Magento_PageBuilder/content-type/image/full-width/preview"
+                        master_template="Magento_PageBuilder/content-type/image/full-width/master"
+                        reader="Magento_PageBuilder/js/master-format/read/configurable">
+                <elements>
+                    <element name="desktop_image">
+                        <style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
+                        <style name="border_color" source="border_color"/>
+                        <style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
+                        <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
+                        <static_style source="max-width" value="100%"/>
+                        <static_style source="height" value="auto"/>
+                        <attribute name="image" source="src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
+                        <attribute name="alt" source="alt"/>
+                        <attribute name="title_attribute" source="title"/>
+                        <attribute name="image_attribute_width" source="width"/>
+                        <attribute name="image_attribute_height" source="height"/>
+                    </element>
+                    <element name="mobile_image">
+                        <style name="border" source="border_style" converter="Magento_PageBuilder/js/converter/style/border-style"/>
+                        <style name="border_color" source="border_color"/>
+                        <style name="border_width" source="border_width" converter="Magento_PageBuilder/js/converter/style/border-width"/>
+                        <style name="border_radius" source="border_radius" converter="Magento_PageBuilder/js/converter/style/remove-px"/>
+                        <static_style source="max-width" value="100%"/>
+                        <static_style source="height" value="auto"/>
+                        <attribute name="mobile_image" source="src" converter="Magento_PageBuilder/js/converter/attribute/src" preview_converter="Magento_PageBuilder/js/converter/attribute/preview/src"/>
+                        <attribute name="alt" source="alt"/>
+                        <attribute name="title_attribute" source="title"/>
+                        <attribute name="mobile_image_attribute_width" source="width"/>
+                        <attribute name="mobile_image_attribute_height" source="height"/>
+                    </element>
+                </elements>
+            </appearance>
+        </appearances>
+    </type>
+</config>
diff --git a/app/code/Magento/PageBuilderImageAttribute/view/adminhtml/ui_component/pagebuilder_image_form.xml b/app/code/Magento/PageBuilderImageAttribute/view/adminhtml/ui_component/pagebuilder_image_form.xml
new file mode 100644
index 00000000000..18e976be813
--- /dev/null
+++ b/app/code/Magento/PageBuilderImageAttribute/view/adminhtml/ui_component/pagebuilder_image_form.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+-->
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" extends="pagebuilder_base_form">
+    <fieldset name="general" sortOrder="20">
+        <field name="image_attribute_width" formElement="input" sortOrder="10">
+            <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>number</dataType>
+                <label translate="true">Image Attribute Width</label>
+                <addAfter translate="true">px</addAfter>
+                <additionalClasses>
+                    <class name="admin__field-small">true</class>
+                </additionalClasses>
+                <dataScope>image_attribute_width</dataScope>
+            </settings>
+        </field>
+        <field name="image_attribute_height" formElement="input" sortOrder="11">
+            <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>number</dataType>
+                <label translate="true">Image Attribute Height</label>
+                <addAfter translate="true">px</addAfter>
+                <additionalClasses>
+                    <class name="admin__field-small">true</class>
+                </additionalClasses>
+                <dataScope>image_attribute_height</dataScope>
+            </settings>
+        </field>
+        <field name="mobile_image_attribute_width" formElement="input" sortOrder="12">
+            <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>number</dataType>
+                <label translate="true">Mobile Image Attribute Width</label>
+                <addAfter translate="true">px</addAfter>
+                <additionalClasses>
+                    <class name="admin__field-small">true</class>
+                </additionalClasses>
+                <dataScope>mobile_image_attribute_width</dataScope>
+            </settings>
+        </field>
+        <field name="mobile_image_attribute_height" formElement="input" sortOrder="13">
+            <settings>
+                <validation>
+                    <rule name="validate-digits" xsi:type="boolean">true</rule>
+                </validation>
+                <dataType>number</dataType>
+                <label translate="true">Mobile Image Attribute Height</label>
+                <addAfter translate="true">px</addAfter>
+                <additionalClasses>
+                    <class name="admin__field-small">true</class>
+                </additionalClasses>
+                <dataScope>mobile_image_attribute_height</dataScope>
+            </settings>
+        </field>
+    </fieldset>
+</form>
diff --git a/app/code/Magento/_metapackage/composer.json b/app/code/Magento/_metapackage/composer.json
index d78e1c181c2..0c702286bf7 100644
--- a/app/code/Magento/_metapackage/composer.json
+++ b/app/code/Magento/_metapackage/composer.json
@@ -7,7 +7,8 @@
         "magento/module-cms-page-builder-analytics": "*",
         "magento/module-page-builder-admin-analytics": "*",
         "magento/module-catalog-page-builder-analytics": "*",
-        "magento/module-aws-s3-page-builder": "*"
+        "magento/module-aws-s3-page-builder": "*",
+        "magento/module-page-builder-image-attribute": "*"
     },
     "type": "metapackage"
 }
diff --git a/dev/dts-generator.js b/dev/dts-generator.js
index 7734cddd26e..fa5e2b7fa4f 100644
--- a/dev/dts-generator.js
+++ b/dev/dts-generator.js
@@ -1,13 +1,13 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 const path = require('path');
 const fs = require('fs');
-const prettier = require('prettier');
-const typesFile = 'page-builder-types/index.d.ts';
-const copyrightComment = `/**
+const prettier = require('prettier'),
+    typesFile = 'page-builder-types/index.d.ts',
+    copyrightComment = `/**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */`;
@@ -18,6 +18,7 @@ const copyrightComment = `/**
  * @param {string} currentModuleId
  * @returns {string}
  */
+// eslint-disable-next-line strict
 function resolveModuleIdToMagentoPath(currentModuleId) {
     return currentModuleId.replace(
         'app/code/Magento/PageBuilder/view/adminhtml/web/ts/',
@@ -29,16 +30,18 @@ function resolveModuleIdToMagentoPath(currentModuleId) {
 require('dts-generator').default({
     project: './',
     out: typesFile,
+    // eslint-disable-next-line strict
     resolveModuleId: (params) => {
         return resolveModuleIdToMagentoPath(params.currentModuleId);
     },
+    // eslint-disable-next-line strict
     resolveModuleImport: (params) => {
         // Convert relative imports into their Magento counterparts
         if (params.importedModuleId.startsWith('../') || params.importedModuleId.startsWith('./')) {
             return resolveModuleIdToMagentoPath(
                 path.resolve(
                     path.dirname(params.currentModuleId),
-                    params.importedModuleId,
+                    params.importedModuleId
                 ).replace(
                     process.cwd() + '/',
                     ''
@@ -48,11 +51,13 @@ require('dts-generator').default({
 
         return params.importedModuleId;
     }
+// eslint-disable-next-line strict
 }).then(() => {
-    const { exec } = require('child_process');
-    // Lint the generated file
-    const lint = exec(`./node_modules/tslint/bin/tslint --fix ${typesFile}`);
-    lint.on("exit", () => {
+    const { exec } = require('child_process'),
+        // Lint the generated file
+        lint = exec(`./node_modules/tslint/bin/tslint --fix ${typesFile}`);
+
+    lint.on('exit', () => {
         // Replace all tab characters with 4 spaces
         fs.readFile(typesFile, 'utf-8', (error, contents) => {
             if (error) {
@@ -61,11 +66,13 @@ require('dts-generator').default({
             let modifiedContents = contents
                 .replace(/.*\/\*\*\n.*Copyright © Magento.*\n.*\n.*\*\//gm, '') // Strip all Magento copyright
                 .replace(/.*\/\*\*\n.*@api.*\n.*\*\//gm, ''); // Strip all @api comments
+
             modifiedContents = `${copyrightComment}\n${modifiedContents}`;
-            fs.writeFile(typesFile, prettier.format(modifiedContents, {parser: "typescript"}), null, () => {
-                console.log("Type definition generation completed.");
+            // eslint-disable-next-line max-nested-callbacks
+            fs.writeFile(typesFile, prettier.format(modifiedContents, {parser: 'typescript'}), null, () => {
+                console.log('Type definition generation completed.');
                 process.exit();
             });
         });
     });
-});
\ No newline at end of file
+});
diff --git a/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/CMSContentProductListingTest.php b/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/CMSContentProductListingTest.php
new file mode 100644
index 00000000000..54498c922d9
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/CMSContentProductListingTest.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Api;
+
+use Magento\Catalog\Model\ResourceModel\Category\Collection;
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\PageRepository;
+use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+class CMSContentProductListingTest extends GraphQlAbstract
+{
+    /**
+     * @var ObjectManagerInterface
+     */
+    private ObjectManagerInterface $objectManager;
+
+    /**
+     * @var SearchCriteriaBuilder
+     */
+    private SearchCriteriaBuilder $searchCriteriaBuilder;
+
+    /**
+     * @var PageRepository
+     */
+    private PageRepository $pageRepository;
+
+    /**
+     * @var Collection
+     */
+    private Collection $categoryCollection;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        $this->objectManager = $objectManager = Bootstrap::getObjectManager();
+        $this->searchCriteriaBuilder = $objectManager->get(SearchCriteriaBuilder::class);
+        $this->pageRepository = $objectManager->get(PageRepository::class);
+        $this->categoryCollection = $this->objectManager->get(Collection::class);
+    }
+
+    /**
+     * Check if product listing is sorted by position
+     *
+     * @magentoDataFixture Magento/Cms/Fixtures/page_list.php
+     * @magentoApiDataFixture Magento/Catalog/_files/category_with_three_products.php
+     * @return void
+     * @throws CouldNotSaveException
+     */
+    public function testCMSContentProductListingSortOrder(): void
+    {
+        $category = $this->categoryCollection->addFieldToFilter(
+            'name',
+            'Category 999'
+        )->getFirstItem();
+        $categoryId = $category->getId();
+        $content = '<style>#html-body [data-pb-style=E4B30DS]{justify-content:flex-start;display:flex;' .
+            'flex-direction:column;background-position:left top;background-size:cover;background-repeat:no-repeat;' .
+            'background-attachment:scroll}</style><div data-content-type="row" data-appearance="contained" ' .
+            'data-element="main"><div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" ' .
+            'data-background-type="image" data-video-loop="true" data-video-play-only-visible="true" ' .
+            'data-video-lazy-load="true" data-video-fallback-src="" data-element="inner" ' .
+            'data-pb-style="E4B30DS"><div data-content-type="products" data-appearance="grid" ' .
+            'data-element="main">{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" ' .
+            'template="Magento_CatalogWidget::product/widget/content/grid.phtml" anchor_text="" id_path="" ' .
+            'show_pager="0" products_count="5" condition_option="category_ids" condition_option_value="' . $categoryId
+            .'"type_name="Catalog Products List" conditions_encoded="^[`1`:^[`aggregator`:`all`,`new_child`:``,' .
+            '`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`value`:`1`^],`1--1`:^[`operator`:`==`,' .
+            '`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`category_ids`,' .
+            '`value`:`' . $categoryId . '`^]^]" sort_order="position"}}</div></div></div>';
+        $page = $this->getPageByTitle('Page with 1column layout');
+        $page->setContent($content);
+        $this->pageRepository->save($page);
+
+        $productPositions = $category->getProductsPosition();
+        $products = array_keys($productPositions);
+        $index = 2;
+        foreach ($products as $product) {
+            $productPositions[$product] = $index;
+            $index--;
+        }
+
+        $category->setPostedProducts($productPositions);
+        $category->save();
+
+        $query = $this->getQuery($page->getIdentifier(), ['title', 'content']);
+        $response = $this->graphQlQueryWithResponseHeaders($query);
+        $position1 = strpos($response['body']['cmsPage']['content'], '/simple-product2.html');
+        $position2 = strpos($response['body']['cmsPage']['content'], '/simple-product-with-price-20.html');
+        $position3 = strpos($response['body']['cmsPage']['content'], '/simple-product-with-price-10.html');
+        $this->assertTrue($position1 < $position2 && $position2 < $position3);
+    }
+
+    /**
+     * Retrieve a page by its title
+     *
+     * @param string $title
+     * @return PageInterface
+     */
+    private function getPageByTitle(string $title): PageInterface
+    {
+        $searchCriteria = $this->searchCriteriaBuilder
+            ->addFilter('title', $title)
+            ->create();
+
+        $pages = $this->pageRepository->getList($searchCriteria)->getItems();
+
+        /** @var PageInterface $page */
+        $page = reset($pages);
+
+        return $page;
+    }
+
+    /**
+     * Create GraphQL CMS page query
+     *
+     * @param string $identifier
+     * @param array $fields
+     * @return string
+     */
+    private function getQuery(string $identifier, array $fields = ['title']): string
+    {
+        $fields = implode(PHP_EOL, $fields);
+
+        return <<<QUERY
+{
+  cmsPage(identifier: "$identifier") {
+    $fields
+  }
+}
+QUERY;
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php
index 395684de7f5..4cfff9f760f 100644
--- a/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php
+++ b/dev/tests/api-functional/testsuite/Magento/PageBuilder/Api/ProductAttributeRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -10,9 +10,9 @@
 
 class ProductAttributeRepositoryTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
-    const SERVICE_NAME = 'catalogProductAttributeRepositoryV1';
-    const SERVICE_VERSION = 'V1';
-    const RESOURCE_PATH = '/V1/products/attributes';
+    public const SERVICE_NAME = 'catalogProductAttributeRepositoryV1';
+    public const SERVICE_VERSION = 'V1';
+    public const RESOURCE_PATH = '/V1/products/attributes';
 
     public function testCreatePageBuilderAttribute()
     {
diff --git a/dev/tests/integration/_files/Magento/TestModuleCmsPageBuilderAnalytics/registration.php b/dev/tests/integration/_files/Magento/TestModuleCmsPageBuilderAnalytics/registration.php
index 1692aa5bf18..1cc73944fb7 100644
--- a/dev/tests/integration/_files/Magento/TestModuleCmsPageBuilderAnalytics/registration.php
+++ b/dev/tests/integration/_files/Magento/TestModuleCmsPageBuilderAnalytics/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Config/ContentType/AdditionalData/Provider/TestData.php b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Config/ContentType/AdditionalData/Provider/TestData.php
index 414878f9219..65277e5b56e 100644
--- a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Config/ContentType/AdditionalData/Provider/TestData.php
+++ b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Config/ContentType/AdditionalData/Provider/TestData.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -10,9 +10,6 @@
 
 use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
 
-/**
- * Class TestData
- */
 class TestData implements ProviderInterface
 {
     public function getData(string $itemName) : array
diff --git a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Stage/Renderer/Test.php b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Stage/Renderer/Test.php
index 895cb6940db..800f14377bd 100644
--- a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Stage/Renderer/Test.php
+++ b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/Model/Stage/Renderer/Test.php
@@ -1,16 +1,13 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
 
 namespace Magento\TestModulePageBuilderExtensionPoints\Model\Stage\Renderer;
 
-/**
- * Class Test
- */
 class Test implements \Magento\PageBuilder\Model\Stage\RendererInterface
 {
     /**
diff --git a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/registration.php b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/registration.php
index 03f239e2efc..a838de212cf 100644
--- a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/registration.php
+++ b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/registration.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/html_content_type.phtml b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/html_content_type.phtml
index 6cff12a8232..d496ed48bb3 100644
--- a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/html_content_type.phtml
+++ b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/html_content_type.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 // @codingStandardsIgnoreFile
@@ -11,4 +11,4 @@
     &lt;img src=&quot;http://example.com&quot;&gt;
     &lt;iframe width=&quot;560&quot; height=&quot;315&quot; src=&quot;https://www.youtube.com/embed/owsfdh4gxyc&quot; frameborder=&quot;0&quot; allowfullscreen&gt;&lt;/iframe&gt;
     &amp;amp;
-</div>
\ No newline at end of file
+</div>
diff --git a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_html.phtml b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_html.phtml
index 0a757b71046..8d1917fa656 100644
--- a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_html.phtml
+++ b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_html.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 // @codingStandardsIgnoreFile
@@ -9,4 +9,4 @@
 ?>
 <div>
     <img src="http://example.com/block">
-</div>
\ No newline at end of file
+</div>
diff --git a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_text.phtml b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_text.phtml
index 4b444f1eeb5..44fd7d9bbe3 100644
--- a/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_text.phtml
+++ b/dev/tests/integration/_files/Magento/TestModulePageBuilderExtensionPoints/view/frontend/templates/static_text.phtml
@@ -1,10 +1,10 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 // @codingStandardsIgnoreFile
 
 ?>
-Hello world
\ No newline at end of file
+Hello world
diff --git a/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php b/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php
index 073a59069b5..4e778b8abac 100644
--- a/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php
+++ b/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/Model/ContentTypeUsageReportProviderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -66,7 +66,7 @@ public function testGetReport($expectedReportData, $ignoredContentTypes)
     /**
      * @return array
      */
-    public function reportDataProvider(): array
+    public static function reportDataProvider(): array
     {
         return [
             [
@@ -78,6 +78,7 @@ public function reportDataProvider(): array
                     ['type' => 'block', 'count' => 1],
                     ['type' => 'row', 'count' => 7],
                     ['type' => 'column-group', 'count' => 5],
+                    ['type' => 'column-line', 'count' => 5],
                     ['type' => 'column', 'count' => 12],
                     ['type' => 'video', 'count' => 2],
                     ['type' => 'heading', 'count' => 3],
diff --git a/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/_files/pages.php b/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/_files/pages.php
index cf2f73eb2be..0e31daa85a6 100644
--- a/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/_files/pages.php
+++ b/dev/tests/integration/testsuite/Magento/CmsPageBuilderAnalytics/_files/pages.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -9,373 +9,383 @@
 // @codingStandardsIgnoreStart
 $content = <<<CONTENT
 <div data-content-type="row" data-appearance="contained" data-element="main">
-    <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
-        <div data-content-type="block" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">{{widget type="MagentoCmsBlockWidgetBlock" template="widget/static_block/default.phtml" block_id="10" type_name="CMS Static Block"}}</div>
-    </div>
+  <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+    <div data-content-type="block" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">{{widget type="MagentoCmsBlockWidgetBlock" template="widget/static_block/default.phtml" block_id="10" type_name="CMS Static Block"}}</div>
+  </div>
 </div>
 <div data-content-type="row" data-appearance="contained" data-element="main">
-    <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
-        <div class="pagebuilder-slider" data-content-type="slider" data-appearance="default" data-autoplay="false" data-autoplay-speed="4000" data-fade="false" data-infinite-loop="false" data-show-arrows="false" data-show-dots="true" data-element="main" style="min-height: 300px; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">
-            <div data-content-type="slide" data-slide-name="Red" data-appearance="poster" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; text-align: center; min-height: 200px;">
-                        <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#008000" data-element="overlay" style="min-height: 200px; padding: 5px 6px 7px 8px; background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-poster-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
-                    </div>
-                </a>
+  <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+    <div class="pagebuilder-slider" data-content-type="slider" data-appearance="default" data-autoplay="false" data-autoplay-speed="4000" data-fade="false" data-infinite-loop="false" data-show-arrows="false" data-show-dots="true" data-element="main" style="min-height: 300px; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="poster" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; text-align: center; min-height: 200px;">
+            <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#008000" data-element="overlay" style="min-height: 200px; padding: 5px 6px 7px 8px; background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-poster-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
             </div>
-            <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-left" data-show-button="hover" data-show-overlay="always" data-element="main" style="min-height: 200px; margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                        <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-collage-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
-                    </div>
-                </a>
+          </div>
+        </a>
+      </div>
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-left" data-show-button="hover" data-show-overlay="always" data-element="main" style="min-height: 200px; margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+            <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-collage-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
             </div>
-            <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                        <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-collage-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
-                    </div>
-                </a>
+          </div>
+        </a>
+      </div>
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+            <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-collage-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
             </div>
-            <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-right" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                        <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-collage-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
-                    </div>
-                </a>
+          </div>
+        </a>
+      </div>
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-right" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+            <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-collage-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
             </div>
-        </div>
-        <div class="pagebuilder-slider" data-content-type="slider" data-appearance="default" data-autoplay="true" data-autoplay-speed="4000" data-fade="false" data-infinite-loop="true" data-show-arrows="true" data-show-dots="true" data-element="main" style="text-align: center; min-height: 300px; border-style: dotted; border-color: rgb(0, 0, 255); border-width: 5px; border-radius: 5px; display: none; margin: 0px; padding: 0px;">
+          </div>
+        </a>
+      </div>
+    </div>
+    <div class="pagebuilder-slider" data-content-type="slider" data-appearance="default" data-autoplay="true" data-autoplay-speed="4000" data-fade="false" data-infinite-loop="true" data-show-arrows="true" data-show-dots="true" data-element="main" style="text-align: center; min-height: 300px; border-style: dotted; border-color: rgb(0, 0, 255); border-width: 5px; border-radius: 5px; display: none; margin: 0px; padding: 0px;">
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="poster" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; text-align: center; min-height: 200px;">
+            <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#008000" data-element="overlay" style="min-height: 200px; padding: 5px 6px 7px 8px; background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-poster-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
+            </div>
+          </div>
+        </a>
+      </div>
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-left" data-show-button="hover" data-show-overlay="always" data-element="main" style="min-height: 200px; margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+            <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-collage-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
+            </div>
+          </div>
+        </a>
+      </div>
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+            <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-collage-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
+            </div>
+          </div>
+        </a>
+      </div>
+      <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-right" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+          <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+            <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+              <div class="pagebuilder-collage-content">
+                <div data-element="content">
+                  <p>Here's some testing text</p>
+                </div>
+                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
+              </div>
+            </div>
+          </div>
+        </a>
+      </div>
+    </div>
+    <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
+      <div class="pagebuilder-column-line" data-content-type="column-line" data-element="main">
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
+          <div class="pagebuilder-slider" data-content-type="slider" data-appearance="default" data-autoplay="true" data-autoplay-speed="4000" data-fade="false" data-infinite-loop="true" data-show-arrows="true" data-show-dots="true" data-element="main" style="text-align: center; min-height: 300px; border-style: dotted; border-color: rgb(0, 0, 255); border-width: 5px; border-radius: 5px; margin: 0px; padding: 0px;">
             <div data-content-type="slide" data-slide-name="Red" data-appearance="poster" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; text-align: center; min-height: 200px;">
-                        <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#008000" data-element="overlay" style="min-height: 200px; padding: 5px 6px 7px 8px; background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-poster-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
+              <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+                <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; text-align: center; min-height: 200px;">
+                  <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#008000" data-element="overlay" style="min-height: 200px; padding: 5px 6px 7px 8px; background-color: rgb(0, 128, 0);">
+                    <div class="pagebuilder-poster-content">
+                      <div data-element="content">
+                        <p>Here's some testing text</p>
+                      </div>
+                      <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
                     </div>
-                </a>
+                  </div>
+                </div>
+              </a>
             </div>
             <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-left" data-show-button="hover" data-show-overlay="always" data-element="main" style="min-height: 200px; margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                        <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-collage-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
+              <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+                <div class="pagebuilder-slide-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+                  <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+                    <div class="pagebuilder-collage-content">
+                      <div data-element="content">
+                        <p>Here's some testing text</p>
+                      </div>
+                      <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
                     </div>
-                </a>
+                  </div>
+                </div>
+              </a>
             </div>
             <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                        <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-collage-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
+              <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+                <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+                  <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+                    <div class="pagebuilder-collage-content">
+                      <div data-element="content">
+                        <p>Here's some testing text</p>
+                      </div>
+                      <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
                     </div>
-                </a>
+                  </div>
+                </div>
+              </a>
             </div>
             <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-right" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                    <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                        <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                            <div class="pagebuilder-collage-content">
-                                <div data-element="content">
-                                    <p>Here's some testing text</p>
-                                </div>
-                                <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                            </div>
-                        </div>
-                    </div>
-                </a>
-            </div>
-        </div>
-        <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
-                <div class="pagebuilder-slider" data-content-type="slider" data-appearance="default" data-autoplay="true" data-autoplay-speed="4000" data-fade="false" data-infinite-loop="true" data-show-arrows="true" data-show-dots="true" data-element="main" style="text-align: center; min-height: 300px; border-style: dotted; border-color: rgb(0, 0, 255); border-width: 5px; border-radius: 5px; margin: 0px; padding: 0px;">
-                    <div data-content-type="slide" data-slide-name="Red" data-appearance="poster" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                            <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; text-align: center; min-height: 200px;">
-                                <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#008000" data-element="overlay" style="min-height: 200px; padding: 5px 6px 7px 8px; background-color: rgb(0, 128, 0);">
-                                    <div class="pagebuilder-poster-content">
-                                        <div data-element="content">
-                                            <p>Here's some testing text</p>
-                                        </div>
-                                        <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-left" data-show-button="hover" data-show-overlay="always" data-element="main" style="min-height: 200px; margin: 1px 2px 3px 4px;">
-                        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                            <div class="pagebuilder-slide-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                                <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                                    <div class="pagebuilder-collage-content">
-                                        <div data-element="content">
-                                            <p>Here's some testing text</p>
-                                        </div>
-                                        <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                            <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                                <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                                    <div class="pagebuilder-collage-content">
-                                        <div data-element="content">
-                                            <p>Here's some testing text</p>
-                                        </div>
-                                        <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </a>
-                    </div>
-                    <div data-content-type="slide" data-slide-name="Red" data-appearance="collage-right" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-                        <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                            <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
-                                <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
-                                    <div class="pagebuilder-collage-content">
-                                        <div data-element="content">
-                                            <p>Here's some testing text</p>
-                                        </div>
-                                        <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
-                                    </div>
-                                </div>
-                            </div>
-                        </a>
+              <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+                <div class="pagebuilder-slide-wrapper" data-background-images="{}" data-element="wrapper" style="background-color: rgb(35, 255, 9); background-position: right top; background-size: cover; background-repeat: no-repeat; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 2px; min-height: 200px; padding: 5px 6px 7px 8px; text-align: center;">
+                  <div class="pagebuilder-overlay" data-overlay-color="#008000" data-element="overlay" style="background-color: rgb(0, 128, 0);">
+                    <div class="pagebuilder-collage-content">
+                      <div data-element="content">
+                        <p>Here's some testing text</p>
+                      </div>
+                      <button type="button" class="pagebuilder-slide-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">Testing</button>
                     </div>
+                  </div>
                 </div>
+              </a>
             </div>
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;"></div>
+          </div>
         </div>
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;"></div>
+      </div>
     </div>
+  </div>
 </div>
 <div data-content-type="row" data-appearance="contained" data-element="main">
-    <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
-        <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
-            <div class="pagebuilder-column test-class" data-content-type="column" data-appearance="full-height" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="main" style="justify-content: center; display: flex; flex-direction: column; background-color: rgb(33, 255, 255); background-position: right center; background-size: contain; background-repeat: repeat; background-attachment: fixed; text-align: center; border-style: double; border-color: rgb(83, 83, 83); border-width: 15px; border-radius: 2px; min-height: 250px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
-                <div data-content-type="divider" data-appearance="default" data-element="main" style="text-align: center; border-style: none; border-width: 1px; border-radius: 0px; display: none; margin: 0px; padding: 10px;">
-                    <hr data-element="line" style="width: 80%; border-width: 15px; border-color: rgb(132, 0, 254); display: inline-block;">
-                </div>
-                <div data-content-type="divider" data-appearance="default" data-element="main" style="text-align: center; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
-                    <hr data-element="line" style="width: 80%; border-width: 15px; border-color: rgb(132, 0, 254); display: inline-block;">
-                </div>
-            </div>
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;"></div>
+  <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+    <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
+      <div class="pagebuilder-column-line" data-content-type="column-line" data-element="main">
+        <div class="pagebuilder-column test-class" data-content-type="column" data-appearance="full-height" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="main" style="justify-content: center; display: flex; flex-direction: column; background-color: rgb(33, 255, 255); background-position: right center; background-size: contain; background-repeat: repeat; background-attachment: fixed; text-align: center; border-style: double; border-color: rgb(83, 83, 83); border-width: 15px; border-radius: 2px; min-height: 250px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
+          <div data-content-type="divider" data-appearance="default" data-element="main" style="text-align: center; border-style: none; border-width: 1px; border-radius: 0px; display: none; margin: 0px; padding: 10px;">
+            <hr data-element="line" style="width: 80%; border-width: 15px; border-color: rgb(132, 0, 254); display: inline-block;">
+          </div>
+          <div data-content-type="divider" data-appearance="default" data-element="main" style="text-align: center; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
+            <hr data-element="line" style="width: 80%; border-width: 15px; border-color: rgb(132, 0, 254); display: inline-block;">
+          </div>
         </div>
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;"></div>
+      </div>
     </div>
+  </div>
 </div>
 <div data-content-type="row" data-appearance="contained" data-element="main">
-    <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
-        <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 41.6667%; margin: 0px; padding: 10px; align-self: stretch;">
-                <div class="testing" data-content-type="video" data-appearance="default" data-element="main" style="text-align: left; display: none; margin: 1px 3px 4px 5px;">
-                    <div class="pagebuilder-video-inner" data-element="inner" style="max-width: 150px;">
-                        <div class="pagebuilder-video-wrapper" data-element="wrapper" style="border-style: solid; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 12px; padding: 6px 7px 8px 9px; background-color: rgb(255, 0, 0);">
-                            <div class="pagebuilder-video-container"><iframe frameborder="0" allowfullscreen="" src="https://www.youtube.com/embed/hmfEimZ9kM0" data-element="video"></iframe></div>
-                        </div>
-                    </div>
-                </div>
+  <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+    <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
+      <div class="pagebuilder-column-line" data-content-type="column-line" data-element="main">
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 41.6667%; margin: 0px; padding: 10px; align-self: stretch;">
+          <div class="testing" data-content-type="video" data-appearance="default" data-element="main" style="text-align: left; display: none; margin: 1px 3px 4px 5px;">
+            <div class="pagebuilder-video-inner" data-element="inner" style="max-width: 150px;">
+              <div class="pagebuilder-video-wrapper" data-element="wrapper" style="border-style: solid; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 12px; padding: 6px 7px 8px 9px; background-color: rgb(255, 0, 0);">
+                <div class="pagebuilder-video-container"><iframe frameborder="0" allowfullscreen="" src="https://www.youtube.com/embed/hmfEimZ9kM0" data-element="video"></iframe></div>
+              </div>
             </div>
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 8.33333%; margin: 0px; padding: 10px; align-self: stretch;"></div>
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
-                <div class="testing" data-content-type="video" data-appearance="default" data-element="main" style="text-align: left; margin: 1px 3px 4px 5px;">
-                    <div class="pagebuilder-video-inner" data-element="inner" style="max-width: 250px;">
-                        <div class="pagebuilder-video-wrapper" data-element="wrapper" style="border-style: solid; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 12px; padding: 6px 7px 8px 9px; background-color: rgb(255, 0, 0);">
-                            <div class="pagebuilder-video-container"><iframe frameborder="0" allowfullscreen="" src="https://www.youtube.com/embed/hmfEimZ9kM0" data-element="video"></iframe></div>
-                        </div>
-                    </div>
-                </div>
+          </div>
+        </div>
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 8.33333%; margin: 0px; padding: 10px; align-self: stretch;"></div>
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
+          <div class="testing" data-content-type="video" data-appearance="default" data-element="main" style="text-align: left; margin: 1px 3px 4px 5px;">
+            <div class="pagebuilder-video-inner" data-element="inner" style="max-width: 250px;">
+              <div class="pagebuilder-video-wrapper" data-element="wrapper" style="border-style: solid; border-color: rgb(255, 0, 0); border-width: 15px; border-radius: 12px; padding: 6px 7px 8px 9px; background-color: rgb(255, 0, 0);">
+                <div class="pagebuilder-video-container"><iframe frameborder="0" allowfullscreen="" src="https://www.youtube.com/embed/hmfEimZ9kM0" data-element="video"></iframe></div>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 <div data-content-type="row" data-appearance="contained" data-element="main">
-    <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
-        <div data-content-type="banner" data-appearance="collage-left" data-show-button="always" data-show-overlay="hover" data-element="main" style="margin: 0px;">
-            <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(135, 135, 135); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; border-style: none; border-width: 1px; border-radius: 0px; padding: 40px; min-height: 300px; text-align: center;">
-                    <div class="pagebuilder-overlay" data-overlay-color="#21ffff" data-element="overlay" style="background-color: transparent;">
-                        <div class="pagebuilder-collage-content">
-                            <div data-element="content">
-                                <div>Testing a banner really well</div>
-                            </div>
-                            <button type="button" class="pagebuilder-banner-button pagebuilder-button-link" data-element="button" style="opacity: 1; visibility: visible;">BUTTON</button>
-                        </div>
-                    </div>
-                </div>
-            </a>
+  <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+    <div data-content-type="banner" data-appearance="collage-left" data-show-button="always" data-show-overlay="hover" data-element="main" style="margin: 0px;">
+      <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+        <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(135, 135, 135); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; border-style: none; border-width: 1px; border-radius: 0px; padding: 40px; min-height: 300px; text-align: center;">
+          <div class="pagebuilder-overlay" data-overlay-color="#21ffff" data-element="overlay" style="background-color: transparent;">
+            <div class="pagebuilder-collage-content">
+              <div data-element="content">
+                <div>Testing a banner really well</div>
+              </div>
+              <button type="button" class="pagebuilder-banner-button pagebuilder-button-link" data-element="button" style="opacity: 1; visibility: visible;">BUTTON</button>
+            </div>
+          </div>
         </div>
-        <div data-content-type="banner" data-appearance="poster" data-show-button="always" data-show-overlay="hover" data-element="main" style="margin: 0px;">
-            <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(135, 135, 135); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; border-style: none; border-width: 1px; border-radius: 0px; text-align: center;">
-                    <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#21ffff" data-element="overlay" style="border-radius: 0px; min-height: 300px; background-color: transparent; padding: 40px;">
-                        <div class="pagebuilder-poster-content">
-                            <div data-element="content">
-                                <div>
-                                    <div>Testing a banner really well</div>
-                                </div>
-                            </div>
-                            <button type="button" class="pagebuilder-banner-button pagebuilder-button-link" data-element="button" style="opacity: 1; visibility: visible;">BUTTON</button>
-                        </div>
-                    </div>
+      </a>
+    </div>
+    <div data-content-type="banner" data-appearance="poster" data-show-button="always" data-show-overlay="hover" data-element="main" style="margin: 0px;">
+      <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+        <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(135, 135, 135); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; border-style: none; border-width: 1px; border-radius: 0px; text-align: center;">
+          <div class="pagebuilder-overlay pagebuilder-poster-overlay" data-overlay-color="#21ffff" data-element="overlay" style="border-radius: 0px; min-height: 300px; background-color: transparent; padding: 40px;">
+            <div class="pagebuilder-poster-content">
+              <div data-element="content">
+                <div>
+                  <div>Testing a banner really well</div>
                 </div>
-            </a>
+              </div>
+              <button type="button" class="pagebuilder-banner-button pagebuilder-button-link" data-element="button" style="opacity: 1; visibility: visible;">BUTTON</button>
+            </div>
+          </div>
         </div>
-        <div data-content-type="banner" data-appearance="collage-right" data-show-button="always" data-show-overlay="hover" data-element="main" style="margin: 0px;">
-            <a href="http://google.com/" target="" data-link-type="default" data-element="link">
-                <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(135, 135, 135); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; border-style: none; border-width: 1px; border-radius: 0px; padding: 40px; min-height: 300px; text-align: center;">
-                    <div class="pagebuilder-overlay" data-overlay-color="#21ffff" data-element="overlay" style="background-color: transparent;">
-                        <div class="pagebuilder-collage-content">
-                            <div data-element="content">
-                                <div>Testing a banner really well</div>
-                            </div>
-                            <button type="button" class="pagebuilder-banner-button pagebuilder-button-link" data-element="button" style="opacity: 1; visibility: visible;">BUTTON</button>
-                        </div>
-                    </div>
-                </div>
-            </a>
+      </a>
+    </div>
+    <div data-content-type="banner" data-appearance="collage-right" data-show-button="always" data-show-overlay="hover" data-element="main" style="margin: 0px;">
+      <a href="http://google.com/" target="" data-link-type="default" data-element="link">
+        <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(135, 135, 135); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; border-style: none; border-width: 1px; border-radius: 0px; padding: 40px; min-height: 300px; text-align: center;">
+          <div class="pagebuilder-overlay" data-overlay-color="#21ffff" data-element="overlay" style="background-color: transparent;">
+            <div class="pagebuilder-collage-content">
+              <div data-element="content">
+                <div>Testing a banner really well</div>
+              </div>
+              <button type="button" class="pagebuilder-banner-button pagebuilder-button-link" data-element="button" style="opacity: 1; visibility: visible;">BUTTON</button>
+            </div>
+          </div>
         </div>
-        <div data-content-type="banner" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
-            <a href="http://google.com/" target="_blank" data-link-type="default" data-element="link">
-                <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(0, 0, 254); background-position: right top; background-size: auto; background-repeat: no-repeat; background-attachment: fixed; border-style: dashed; border-color: rgb(83, 83, 83); border-width: 15px; border-radius: 15px; padding: 5px 6px 7px 9px; min-height: 300px; text-align: left;">
-                    <div class="pagebuilder-overlay" data-overlay-color="#21ffff" data-element="overlay" style="background-color: rgb(33, 255, 255);">
-                        <div class="pagebuilder-collage-content">
-                            <div data-element="content">
-                                <div>Testing a banner really well, yeah</div>
-                            </div>
-                            <button type="button" class="pagebuilder-banner-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">BUTTON</button>
-                        </div>
-                    </div>
-                </div>
-            </a>
+      </a>
+    </div>
+    <div data-content-type="banner" data-appearance="collage-centered" data-show-button="hover" data-show-overlay="always" data-element="main" style="margin: 1px 2px 3px 4px;">
+      <a href="http://google.com/" target="_blank" data-link-type="default" data-element="link">
+        <div class="pagebuilder-banner-wrapper" data-background-images="{&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;}" data-element="wrapper" style="background-color: rgb(0, 0, 254); background-position: right top; background-size: auto; background-repeat: no-repeat; background-attachment: fixed; border-style: dashed; border-color: rgb(83, 83, 83); border-width: 15px; border-radius: 15px; padding: 5px 6px 7px 9px; min-height: 300px; text-align: left;">
+          <div class="pagebuilder-overlay" data-overlay-color="#21ffff" data-element="overlay" style="background-color: rgb(33, 255, 255);">
+            <div class="pagebuilder-collage-content">
+              <div data-element="content">
+                <div>Testing a banner really well, yeah</div>
+              </div>
+              <button type="button" class="pagebuilder-banner-button pagebuilder-button-secondary" data-element="button" style="opacity: 0; visibility: hidden;">BUTTON</button>
+            </div>
+          </div>
         </div>
+      </a>
     </div>
+  </div>
 </div>
 <div class="testing-class" data-content-type="row" data-appearance="full-width" data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/bottom-left.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208_1.jpg}}&quot;}" data-element="main" style="justify-content: center; display: flex; flex-direction: column; background-color: rgb(0, 0, 0); background-position: center center; background-size: contain; background-repeat: repeat; background-attachment: fixed; text-align: left; border-style: dashed; border-color: rgb(0, 128, 0); border-width: 5px; border-radius: 5px; min-height: 500px; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px;">
-    <div class="row-full-width-inner" data-element="inner">
-        <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
-            <div class="pagebuilder-column testing-1" data-content-type="column" data-appearance="align-center" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-color: rgba(255, 255, 255, 0.23); background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; text-align: center; border-style: ridge; border-color: rgb(132, 0, 254); border-width: 5px; border-radius: 0px; min-height: 250px; width: 25%; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px; align-self: center;">
-                <h2 data-content-type="heading" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px;">Here's a heading</h2>
-                <div data-content-type="text" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">
-                    <p>and a magic text block</p>
-                </div>
-                <div data-content-type="divider" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
-                    <hr data-element="line" style="width: 100%; border-width: 1px; border-color: rgb(206, 206, 206); display: inline-block;">
-                </div>
-                <div data-content-type="html" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">&lt;strong&gt;Testing HTML&lt;/strong&gt;</div>
-            </div>
-            <div class="pagebuilder-column testing-1" data-content-type="column" data-appearance="align-center" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/Screenshot_2018-12-28_at_11.31.12.png}}&quot;}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-color: rgba(255, 255, 255, 0.23); background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; text-align: center; border-style: ridge; border-color: rgb(132, 0, 254); border-width: 5px; border-radius: 0px; min-height: 250px; width: 25%; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px; align-self: center;"></div>
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
-                <h2 data-content-type="heading" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px;">and another</h2>
-                <figure class="testinggg" data-content-type="image" data-appearance="full-width" data-element="main" style="text-align: center; margin: 1px 2px 0px 3px; padding: 5px 6px 83px 2px; border-style: none;">
-                    <a href="http://adobe.com/" target="" data-link-type="default" title="TITLE" data-element="link"><img class="pagebuilder-mobile-hidden" src="{{media url=wysiwyg/bottom-left.jpg}}" alt="ALT" title="TITLE" data-element="desktop_image" style="border-style: double; border-color: rgb(83, 55, 150); border-width: 2px; border-radius: 5px; max-width: 100%; height: auto;"><img class="pagebuilder-mobile-only" src="{{media url=wysiwyg/AdobeStock_78698208_1.jpg}}" alt="ALT" title="TITLE" data-element="mobile_image" style="border-style: double; border-color: rgb(83, 55, 150); border-width: 2px; border-radius: 5px; max-width: 100%; height: auto;"></a>
-                    <figcaption data-element="caption">Thsi is caption</figcaption>
-                </figure>
-            </div>
+  <div class="row-full-width-inner" data-element="inner">
+    <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
+      <div class="pagebuilder-column-line" data-content-type="column-line" data-element="main">
+        <div class="pagebuilder-column testing-1" data-content-type="column" data-appearance="align-center" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-color: rgba(255, 255, 255, 0.23); background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; text-align: center; border-style: ridge; border-color: rgb(132, 0, 254); border-width: 5px; border-radius: 0px; min-height: 250px; width: 25%; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px; align-self: center;">
+          <h2 data-content-type="heading" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px;">Here's a heading</h2>
+          <div data-content-type="text" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">
+            <p>and a magic text block</p>
+          </div>
+          <div data-content-type="divider" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
+            <hr data-element="line" style="width: 100%; border-width: 1px; border-color: rgb(206, 206, 206); display: inline-block;">
+          </div>
+          <div data-content-type="html" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">&lt;strong&gt;Testing HTML&lt;/strong&gt;</div>
         </div>
+        <div class="pagebuilder-column testing-1" data-content-type="column" data-appearance="align-center" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;,&quot;mobile_image&quot;:&quot;{{media url=wysiwyg/Screenshot_2018-12-28_at_11.31.12.png}}&quot;}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-color: rgba(255, 255, 255, 0.23); background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; text-align: center; border-style: ridge; border-color: rgb(132, 0, 254); border-width: 5px; border-radius: 0px; min-height: 250px; width: 25%; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px; align-self: center;"></div>
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 50%; margin: 0px; padding: 10px; align-self: stretch;">
+          <h2 data-content-type="heading" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px;">and another</h2>
+          <figure class="testinggg" data-content-type="image" data-appearance="full-width" data-element="main" style="text-align: center; margin: 1px 2px 0px 3px; padding: 5px 6px 83px 2px; border-style: none;">
+            <a href="http://adobe.com/" target="" data-link-type="default" title="TITLE" data-element="link"><img class="pagebuilder-mobile-hidden" src="{{media url=wysiwyg/bottom-left.jpg}}" alt="ALT" title="TITLE" data-element="desktop_image" style="border-style: double; border-color: rgb(83, 55, 150); border-width: 2px; border-radius: 5px; max-width: 100%; height: auto;"><img class="pagebuilder-mobile-only" src="{{media url=wysiwyg/AdobeStock_78698208_1.jpg}}" alt="ALT" title="TITLE" data-element="mobile_image" style="border-style: double; border-color: rgb(83, 55, 150); border-width: 2px; border-radius: 5px; max-width: 100%; height: auto;"></a>
+            <figcaption data-element="caption">Thsi is caption</figcaption>
+          </figure>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
 <div data-content-type="row" data-appearance="contained" data-element="main">
-    <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
-        <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 41.6667%; margin: 0px; padding: 10px; align-self: stretch;">
-                <div class="tab-align-left" data-content-type="tabs" data-appearance="default" data-active-tab="" data-element="main" style="margin: 0px; padding: 0px;">
-                    <ul role="tablist" class="tabs-navigation" data-element="navigation" style="text-align: left;">
-                        <li role="tab" class="tab-header" data-element="headers" style="border-radius: 0px; border-width: 1px;"><a href="#HIAW8QO" class="tab-title"><span class="tab-title">Our first tab</span></a></li>
-                        <li role="tab" class="tab-header" data-element="headers" style="border-radius: 0px; border-width: 1px;"><a href="#YCOG3K9" class="tab-title"><span class="tab-title">A second tab</span></a></li>
-                    </ul>
-                    <div class="tabs-content" data-element="content" style="border-width: 1px; border-radius: 0px; min-height: 300px;">
-                        <div data-content-type="tab-item" data-appearance="default" data-tab-name="Our first tab" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="main" id="HIAW8QO" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: right bottom; background-size: auto; background-repeat: repeat; background-attachment: fixed; text-align: center; border-width: 1px; border-radius: 0px; min-height: 150px; margin: 0px; padding: 40px;">
-                            <div data-content-type="map" data-appearance="default" data-show-controls="true" data-locations="[{&quot;location_name&quot;:&quot;Homw&quot;,&quot;position&quot;:{&quot;latitude&quot;:-14,&quot;longitude&quot;:12},&quot;phone&quot;:&quot;6624235&quot;,&quot;address&quot;:&quot;123 Testing&quot;,&quot;city&quot;:&quot;Test&quot;,&quot;state&quot;:&quot;Test&quot;,&quot;zipcode&quot;:&quot;Test&quot;,&quot;comment&quot;:&quot;Testing&quot;,&quot;country&quot;:&quot;United States&quot;,&quot;record_id&quot;:0},{&quot;position&quot;:{&quot;latitude&quot;:30.09625467271396,&quot;longitude&quot;:-97.01250917968753},&quot;location_name&quot;:&quot;Somewhere else&quot;,&quot;phone&quot;:&quot;&quot;,&quot;address&quot;:&quot;&quot;,&quot;city&quot;:&quot;&quot;,&quot;state&quot;:&quot;&quot;,&quot;zipcode&quot;:&quot;&quot;,&quot;country&quot;:[],&quot;comment&quot;:&quot;&quot;,&quot;record_id&quot;:1}]" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px; height: 500px;"></div>
-                            <div data-content-type="html" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">&lt;input type="text" name="testing" /&gt;</div>
-                        </div>
-                        <div data-content-type="tab-item" data-appearance="default" data-tab-name="A second tab" data-background-images="{}" data-element="main" id="YCOG3K9" style="justify-content: center; display: flex; flex-direction: column; background-color: rgb(0, 0, 0); background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-color: rgb(255, 0, 0); border-width: 1px; border-radius: 0px; min-height: 300px; margin: 0px; padding: 40px;">
-                            <figure data-content-type="image" data-appearance="full-width" data-element="main" style="margin: 0px; padding: 0px; border-style: none;"><img class="pagebuilder-mobile-hidden" src="{{media url=wysiwyg/Screenshot_2018-12-28_at_11.31.12.png}}" alt="" title="" data-element="desktop_image" style="border-style: none; border-width: 1px; border-radius: 0px; max-width: 100%; height: auto;"><img class="pagebuilder-mobile-only" src="{{media url=wysiwyg/Screenshot_2018-12-28_at_11.31.12.png}}" alt="" title="" data-element="mobile_image" style="border-style: none; border-width: 1px; border-radius: 0px; max-width: 100%; height: auto;"></figure>
-                            <div data-content-type="divider" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
-                                <hr data-element="line" style="width: 100%; border-width: 1px; border-color: rgb(206, 206, 206); display: inline-block;">
-                            </div>
-                            <h2 data-content-type="heading" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px;">An internal heading</h2>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 58.3333%; margin: 0px; padding: 10px; align-self: stretch;">
-                <div data-content-type="buttons" data-appearance="stacked" data-same-width="true" data-element="main" class="test-class" style="text-align: center; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 5px; border-radius: 12px; display: flex; margin: 1px 2px 3px 4px; padding: 5px 6px 8px 9px; flex-direction: column;">
-                    <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
-                        <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Our first button</span></div>
-                    </div>
-                    <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
-                        <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
-                    </div>
-                    <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
-                        <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
-                    </div>
-                </div>
+  <div data-enable-parallax="0" data-parallax-speed="0.5" data-background-images="{}" data-element="inner" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; margin: 0px 0px 10px; padding: 10px;">
+    <div class="pagebuilder-column-group" style="display: flex;" data-content-type="column-group" data-grid-size="12" data-element="main">
+      <div class="pagebuilder-column-line" data-content-type="column-line" data-element="main">
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 41.6667%; margin: 0px; padding: 10px; align-self: stretch;">
+          <div class="tab-align-left" data-content-type="tabs" data-appearance="default" data-active-tab="" data-element="main" style="margin: 0px; padding: 0px;">
+            <ul role="tablist" class="tabs-navigation" data-element="navigation" style="text-align: left;">
+              <li role="tab" class="tab-header" data-element="headers" style="border-radius: 0px; border-width: 1px;"><a href="#HIAW8QO" class="tab-title"><span class="tab-title">Our first tab</span></a></li>
+              <li role="tab" class="tab-header" data-element="headers" style="border-radius: 0px; border-width: 1px;"><a href="#YCOG3K9" class="tab-title"><span class="tab-title">A second tab</span></a></li>
+            </ul>
+            <div class="tabs-content" data-element="content" style="border-width: 1px; border-radius: 0px; min-height: 300px;">
+              <div data-content-type="tab-item" data-appearance="default" data-tab-name="Our first tab" data-background-images="{&quot;desktop_image&quot;:&quot;{{media url=wysiwyg/AdobeStock_78698208.jpg}}&quot;}" data-element="main" id="HIAW8QO" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: right bottom; background-size: auto; background-repeat: repeat; background-attachment: fixed; text-align: center; border-width: 1px; border-radius: 0px; min-height: 150px; margin: 0px; padding: 40px;">
+                <div data-content-type="map" data-appearance="default" data-show-controls="true" data-locations="[{&quot;location_name&quot;:&quot;Homw&quot;,&quot;position&quot;:{&quot;latitude&quot;:-14,&quot;longitude&quot;:12},&quot;phone&quot;:&quot;6624235&quot;,&quot;address&quot;:&quot;123 Testing&quot;,&quot;city&quot;:&quot;Test&quot;,&quot;state&quot;:&quot;Test&quot;,&quot;zipcode&quot;:&quot;Test&quot;,&quot;comment&quot;:&quot;Testing&quot;,&quot;country&quot;:&quot;United States&quot;,&quot;record_id&quot;:0},{&quot;position&quot;:{&quot;latitude&quot;:30.09625467271396,&quot;longitude&quot;:-97.01250917968753},&quot;location_name&quot;:&quot;Somewhere else&quot;,&quot;phone&quot;:&quot;&quot;,&quot;address&quot;:&quot;&quot;,&quot;city&quot;:&quot;&quot;,&quot;state&quot;:&quot;&quot;,&quot;zipcode&quot;:&quot;&quot;,&quot;country&quot;:[],&quot;comment&quot;:&quot;&quot;,&quot;record_id&quot;:1}]" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px; height: 500px;"></div>
+                <div data-content-type="html" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 0px;">&lt;input type="text" name="testing" /&gt;</div>
+              </div>
+              <div data-content-type="tab-item" data-appearance="default" data-tab-name="A second tab" data-background-images="{}" data-element="main" id="YCOG3K9" style="justify-content: center; display: flex; flex-direction: column; background-color: rgb(0, 0, 0); background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-color: rgb(255, 0, 0); border-width: 1px; border-radius: 0px; min-height: 300px; margin: 0px; padding: 40px;">
+                <figure data-content-type="image" data-appearance="full-width" data-element="main" style="margin: 0px; padding: 0px; border-style: none;"><img class="pagebuilder-mobile-hidden" src="{{media url=wysiwyg/Screenshot_2018-12-28_at_11.31.12.png}}" alt="" title="" data-element="desktop_image" style="border-style: none; border-width: 1px; border-radius: 0px; max-width: 100%; height: auto;"><img class="pagebuilder-mobile-only" src="{{media url=wysiwyg/Screenshot_2018-12-28_at_11.31.12.png}}" alt="" title="" data-element="mobile_image" style="border-style: none; border-width: 1px; border-radius: 0px; max-width: 100%; height: auto;"></figure>
                 <div data-content-type="divider" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
-                    <hr data-element="line" style="width: 100%; border-width: 1px; border-color: rgb(206, 206, 206); display: inline-block;">
+                  <hr data-element="line" style="width: 100%; border-width: 1px; border-color: rgb(206, 206, 206); display: inline-block;">
                 </div>
-                <div data-content-type="buttons" data-appearance="inline" data-same-width="false" data-element="main" style="text-align: right; border-style: double; border-color: rgb(0, 0, 0); border-width: 1px; border-radius: 50px; display: inline-block; margin: 0px; padding: 10px 10px 0px;">
-                    <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
-                        <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Our first button</span></div>
-                    </div>
-                    <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
-                        <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
-                    </div>
-                    <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
-                        <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
-                    </div>
-                </div>
-                <div data-content-type="map" data-appearance="default" data-show-controls="true" data-locations="[{&quot;location_name&quot;:&quot;Homw&quot;,&quot;position&quot;:{&quot;latitude&quot;:-14,&quot;longitude&quot;:12},&quot;phone&quot;:&quot;6624235&quot;,&quot;address&quot;:&quot;123 Testing&quot;,&quot;city&quot;:&quot;Test&quot;,&quot;state&quot;:&quot;Test&quot;,&quot;zipcode&quot;:&quot;Test&quot;,&quot;comment&quot;:&quot;Testing&quot;,&quot;country&quot;:&quot;United States&quot;,&quot;record_id&quot;:0,&quot;initialize&quot;:true},{&quot;position&quot;:{&quot;latitude&quot;:30.09625467271396,&quot;longitude&quot;:-97.01250917968753},&quot;location_name&quot;:&quot;Somewhere else&quot;,&quot;phone&quot;:&quot;&quot;,&quot;address&quot;:&quot;&quot;,&quot;city&quot;:&quot;&quot;,&quot;state&quot;:&quot;&quot;,&quot;zipcode&quot;:&quot;&quot;,&quot;country&quot;:[],&quot;comment&quot;:&quot;&quot;,&quot;record_id&quot;:1,&quot;initialize&quot;:true}]" data-element="main" style="text-align: center; border-style: double; border-color: rgb(255, 255, 13); border-width: 15px; border-radius: 15px; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px; height: 250px;"></div>
+                <h2 data-content-type="heading" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px;">An internal heading</h2>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="pagebuilder-column" data-content-type="column" data-appearance="full-height" data-background-images="{}" data-element="main" style="justify-content: flex-start; display: flex; flex-direction: column; background-position: left top; background-size: cover; background-repeat: no-repeat; background-attachment: scroll; border-style: none; border-width: 1px; border-radius: 0px; width: 58.3333%; margin: 0px; padding: 10px; align-self: stretch;">
+          <div data-content-type="buttons" data-appearance="stacked" data-same-width="true" data-element="main" class="test-class" style="text-align: center; border-style: dashed; border-color: rgb(255, 0, 0); border-width: 5px; border-radius: 12px; display: flex; margin: 1px 2px 3px 4px; padding: 5px 6px 8px 9px; flex-direction: column;">
+            <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
+              <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Our first button</span></div>
+            </div>
+            <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
+              <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
+            </div>
+            <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
+              <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
+            </div>
+          </div>
+          <div data-content-type="divider" data-appearance="default" data-element="main" style="border-style: none; border-width: 1px; border-radius: 0px; margin: 0px; padding: 10px;">
+            <hr data-element="line" style="width: 100%; border-width: 1px; border-color: rgb(206, 206, 206); display: inline-block;">
+          </div>
+          <div data-content-type="buttons" data-appearance="inline" data-same-width="false" data-element="main" style="text-align: right; border-style: double; border-color: rgb(0, 0, 0); border-width: 1px; border-radius: 50px; display: inline-block; margin: 0px; padding: 10px 10px 0px;">
+            <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
+              <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Our first button</span></div>
+            </div>
+            <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
+              <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
+            </div>
+            <div data-content-type="button-item" data-appearance="default" data-element="main" style="display: inline-block;">
+              <div class="pagebuilder-button-primary" data-element="empty_link" style="text-align: center;"><span data-element="link_text">Secondary button</span></div>
             </div>
+          </div>
+          <div data-content-type="map" data-appearance="default" data-show-controls="true" data-locations="[{&quot;location_name&quot;:&quot;Homw&quot;,&quot;position&quot;:{&quot;latitude&quot;:-14,&quot;longitude&quot;:12},&quot;phone&quot;:&quot;6624235&quot;,&quot;address&quot;:&quot;123 Testing&quot;,&quot;city&quot;:&quot;Test&quot;,&quot;state&quot;:&quot;Test&quot;,&quot;zipcode&quot;:&quot;Test&quot;,&quot;comment&quot;:&quot;Testing&quot;,&quot;country&quot;:&quot;United States&quot;,&quot;record_id&quot;:0,&quot;initialize&quot;:true},{&quot;position&quot;:{&quot;latitude&quot;:30.09625467271396,&quot;longitude&quot;:-97.01250917968753},&quot;location_name&quot;:&quot;Somewhere else&quot;,&quot;phone&quot;:&quot;&quot;,&quot;address&quot;:&quot;&quot;,&quot;city&quot;:&quot;&quot;,&quot;state&quot;:&quot;&quot;,&quot;zipcode&quot;:&quot;&quot;,&quot;country&quot;:[],&quot;comment&quot;:&quot;&quot;,&quot;record_id&quot;:1,&quot;initialize&quot;:true}]" data-element="main" style="text-align: center; border-style: double; border-color: rgb(255, 255, 13); border-width: 15px; border-radius: 15px; margin: 1px 2px 3px 4px; padding: 5px 6px 7px 8px; height: 250px;"></div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 CONTENT;
 // @codingStandardsIgnoreEnd
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php
index 30c7babf3cb..7dea27eab6e 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Category/ViewTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php
index 23590956836..8250b9027ec 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Block/Catalog/Product/ViewTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -72,7 +72,7 @@ public function testSectionWrapperWithoutSectionId(string $sectionId): void
      *
      * @return array
      */
-    public function sectionWrapperDataProvider(): array
+    public static function sectionWrapperDataProvider(): array
     {
         return [
             ['description'],
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php
index b314dcac5b1..1b6a94d7478 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/CatalogWidget/Block/Product/ProductListTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -10,7 +10,10 @@
 use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\CatalogWidget\Block\Product\ProductsList;
 use Magento\Store\Model\Store;
+use Magento\TestFramework\Fixture\AppArea;
+use Magento\TestFramework\Fixture\Config;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Widget\Model\Template\Filter;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -113,6 +116,7 @@ public function testProductWithDifferentPriceOnEachWebsite(): void
     /**
      * Test that filtering by category works correctly together with sorting
      *
+     * @magentoDbIsolation disabled
      * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
      * @magentoDataFixture Magento/Catalog/_files/products_list.php
      * @magentoDataFixture Magento/Catalog/_files/categories_no_products.php
@@ -152,7 +156,7 @@ public function testCategoryFilterAndSort(array $categories, int $categoryId, st
     /**
      * @return array
      */
-    public function priceFilterDataProvider(): array
+    public static function priceFilterDataProvider(): array
     {
         return [
             [
@@ -188,7 +192,7 @@ public function priceFilterDataProvider(): array
     /**
      * @return array
      */
-    public function priceSortDataProvider(): array
+    public static function priceSortDataProvider(): array
     {
         return [
             [
@@ -211,7 +215,7 @@ public function priceSortDataProvider(): array
     /**
      * @return array
      */
-    public function categoryFilterAndSortDataProvider(): array
+    public static function categoryFilterAndSortDataProvider(): array
     {
         $categories = [
             //Category 1
@@ -290,4 +294,37 @@ public function categoryFilterAndSortDataProvider(): array
             ]
         ];
     }
+
+    #[
+        AppArea('frontend'),
+        Config('dev/template/minify_html', 1, 'store', 'default')
+    ]
+    public function testWidgetWithMinification()
+    {
+        /** @var Filter $filter */
+        $filter = Bootstrap::getObjectManager()->create(
+            Filter::class
+        );
+        $notExistedSku = uniqid();
+        $construction = [
+            0 => '{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" ' .
+                'template="Magento_PageBuilder::catalog/product/widget/content/carousel.phtml" anchor_text="" ' .
+                'id_path="" show_pager="0" products_count="20" condition_option="sku" condition_option_value="' .
+                $notExistedSku . '" ' .
+                'type_name="Catalog Products Carousel" conditions_encoded="^[`1`:^[`aggregator`:`all`,`new_child`:``,' .
+                '`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`value`:`1`^],`1--1`:' .
+                '^[`operator`:`()`,`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`' .
+                ',`value`:`' . $notExistedSku . '`^]^]" sort_order="position_by_sku" store_id="0"}}',
+            1 => 'widget',
+            2 => 'type="Magento\CatalogWidget\Block\Product\ProductsList" ' .
+                'template="Magento_PageBuilder::catalog/product/widget/content/carousel.phtml" anchor_text="" ' .
+                'id_path="" show_pager="0" products_count="20" condition_option="sku" condition_option_value="' .
+                $notExistedSku . '" ' .
+                'type_name="Catalog Products Carousel" conditions_encoded="^[`1`:^[`aggregator`:`all`,`new_child`:``,' .
+                '`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`value`:`1`^],`1--1`:' .
+                '^[`operator`:`()`,`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:' .
+                '`sku`,`value`:`' . $notExistedSku . '`^]^]" sort_order="position_by_sku" store_id="0"'
+        ];
+        $this->assertEquals('', $filter->generateWidget($construction));
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php
index 26d9aba796d..4ff0575e5c9 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/UploadTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php
index 9e3b41cd7f2..4165cc58e0d 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditions/ChildTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php
index 50e066bb553..ecda7fa826a 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Form/Element/ProductConditionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php
index 038427c14cb..07b59954f32 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/DeleteTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php
index bdf3b26c211..4b6755a24e2 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Controller/Adminhtml/Template/SaveTest.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Controller\Adminhtml\Template;
 
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\Filesystem\DriverInterface;
@@ -17,167 +17,271 @@
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\PageBuilder\Api\TemplateRepositoryInterface;
+use Magento\PageBuilder\Controller\Adminhtml\Template\Save as TemplateSaveController;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\ObjectManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Perform tests upon Template save controller
  *
  * @magentoAppArea adminhtml
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class SaveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
-    /**
-     * @var TemplateRepositoryInterface
-     */
-    private $templateRepository;
-
     /**
      * @var ObjectManager
      */
     private $objectManager;
 
     /**
-     * @var Write|\PHPUnit\Framework\MockObject\MockObject
+     * @var TemplateSaveController
      */
-    private $directoryWrite;
+    private $templateSaveController;
 
     /**
-     * @var Filesystem|\PHPUnit\Framework\MockObject\MockObject
+     * @inheritDoc
      */
-    private $filesystem;
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->templateSaveController = $this->objectManager->create(
+            TemplateSaveController::class,
+            [
+                'filesystem' => $this->getFileSystem(),
+                'mediaStorage' => $this->getMediaStorage(),
+                'imageAdapterFactory' => $this->getImageAdapterFactory()
+            ]
+        );
+    }
 
     /**
-     * @var Database|\PHPUnit\Framework\MockObject\MockObject
+     * Assert response data if previewImage POST value is absent.
+     * @magentoDbIsolation enabled
+     *
+     * @return void
      */
-    private $mediaStorage;
+    public function testSaveTemplateNoPreviewImage()
+    {
+        $post = [
+            'name' => 'Automated Template',
+            'template' => '<div data-content-type="row"></div>',
+            'createdFor' => 'any'
+        ];
+        $this->assertArrayNotHasKey(
+            'preview_image',
+            $this->getControllerResponse($post)['data'],
+            'Result data should not contain "preview_image" property'
+        );
+    }
 
     /**
-     * @var \Magento\PageBuilder\Controller\Adminhtml\Template\Save
+     * Assert response data contains error if overflowed image data received from POST request.
+     * If canvas size is overflowed on frontend, `data:,` will return in 'previewImage'.
+     * @magentoDbIsolation enabled
+     *
+     * @return void
      */
-    private $saveController;
+    public function testSaveTemplateOverflowMaximumCanvasSize()
+    {
+        $post = [
+            'name' => 'Automated Template',
+            'template' => '<div data-content-type="row"></div>',
+            'createdFor' => 'any',
+            'previewImage' => 'data:,'
+        ];
+        $response = $this->getControllerResponse($post);
+        $this->assertEquals(
+            'error',
+            $response['status']
+        );
+        $this->assertEquals(
+            'Unable to upload image.',
+            $response['message']
+        );
+    }
 
     /**
-     * @var Json
+     * Test saving a template using the controller.
+     * @magentoDbIsolation enabled
+     *
+     * @return void
+     * @throws LocalizedException
      */
-    private $serializer;
+    public function testSaveAction()
+    {
+        $post = [
+            'name' => 'Automated Template',
+            'template' => '<div data-content-type="row"></div>',
+            'createdFor' => 'any',
+            // phpcs:disable Generic.Files.LineLength
+            'previewImage' => 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/2wBDAQMDAwQDBAgEBAgQCwkLEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBD/wAARCAAZABkDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAn/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AJVAAAAAAAA//9k='
+        ];
 
-    /**
-     * @var Gd2|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $imageAdapter;
+        $response = $this->getControllerResponse($post);
+        $this->assertEquals(
+            'application/json',
+            $this->getResponse()->getHeader('Content-Type')->getFieldValue()
+        );
+
+        $this->assertNotNull($response['status']);
+        $this->assertEquals(
+            'ok',
+            $response['status'],
+            $response['message'] ?? null
+        );
+
+        $template = $this->getTemplateRepository()->get($response['data']['id']);
+        $this->assertEquals('Automated Template', $template->getName());
+        $this->assertEquals('<div data-content-type="row"></div>', $template->getTemplate());
+        $this->assertEquals('any', $template->getCreatedFor());
+        $this->assertStringContainsString('.template-manager/automatedtemplate', $template->getPreviewImage());
+    }
 
     /**
-     * @var AdapterFactory|\PHPUnit\Framework\MockObject\MockObject
+     * Perform POST request and unserialize response.
+     *
+     * @param array $post
+     * @return array
      */
-    private $imageAdapterFactory;
+    private function getControllerResponse(array $post): array
+    {
+        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
+        $response = $this->templateSaveController->execute();
+        $response->renderResult($this->getResponse());
+        return $this->getSerializer()->unserialize($this->getResponse()->getBody());
+    }
 
     /**
-     * @inheritDoc
+     * Create DirectoryWrite mock.
+     *
+     * @return (Write&MockObject)|MockObject
      */
-    protected function setUp(): void
+    private function getDirectoryWrite(): Write|MockObject
     {
-        parent::setUp();
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->templateRepository = $this->objectManager->get(TemplateRepositoryInterface::class);
-
-        $this->directoryWrite = $this->getMockBuilder(Write::class)
+        $directoryWrite = $this->getMockBuilder(Write::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->filesystem = $this->getMockBuilder(Filesystem::class)
-            ->setMethods(['getDirectoryWrite'])
+        $directoryWrite->expects($this->any())
+            ->method('getAbsolutePath')
+            ->with('.template-manager')
+            ->willReturn('absolute/path/.template-manager/');
+        $directoryWrite->expects($this->any())
+            ->method('create')
+            ->with('absolute/path/.template-manager/');
+        $directoryWrite->expects($this->any())
+            ->method('getDriver')
+            ->willReturn($this->getDriver());
+        $directoryWrite->expects($this->any())
+            ->method('getRelativePath')
+            ->willReturn('.template-manager/automatedtemplate');
+
+        return $directoryWrite;
+    }
+
+    /**
+     * Create Driver mock.
+     *
+     * @return (DriverInterface&MockObject)|MockObject
+     */
+    private function getDriver(): DriverInterface|MockObject
+    {
+        $driver = $this->getMockBuilder(DriverInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $driver->expects($this->any())->method('filePutContents');
+        return $driver;
+    }
+
+    /**
+     * Retrieve TemplateRepository.
+     *
+     * @return TemplateRepositoryInterface
+     */
+    private function getTemplateRepository(): TemplateRepositoryInterface
+    {
+        return $this->objectManager->get(TemplateRepositoryInterface::class);
+    }
 
-        $this->mediaStorage = $this->getMockBuilder(Database::class)
-            ->setMethods(['checkDbUsage', 'saveFile'])
+    /**
+     * Create FileSystem mock.
+     *
+     * @return (Filesystem&MockObject)|MockObject
+     */
+    private function getFileSystem(): FileSystem|MockObject
+    {
+        $filesystem = $this->getMockBuilder(Filesystem::class)
+            ->onlyMethods(['getDirectoryWrite'])
             ->disableOriginalConstructor()
             ->getMock();
+        $filesystem->expects($this->any())
+            ->method('getDirectoryWrite')
+            ->willReturn($this->getDirectoryWrite());
 
-        $this->imageAdapter = $this->getMockBuilder(Gd2::class)
-            ->setMethods(['open', 'resize', 'save'])
+        return $filesystem;
+    }
+
+    /**
+     * Create MediaStorage mock.
+     *
+     * @return (Database&MockObject)|MockObject
+     */
+    private function getMediaStorage(): Database|MockObject
+    {
+        return $this->getMockBuilder(Database::class)
+            ->onlyMethods(['checkDbUsage', 'saveFile'])
             ->disableOriginalConstructor()
             ->getMock();
+    }
 
-        $this->imageAdapterFactory = $this->getMockBuilder(AdapterFactory::class)
-            ->setMethods(['create'])
+    /**
+     * Create ImageAdapterFactory mock.
+     *
+     * @return (AdapterFactory&MockObject)|MockObject
+     */
+    private function getImageAdapterFactory(): AdapterFactory|MockObject
+    {
+        $imageAdapterFactory = $this->getMockBuilder(AdapterFactory::class)
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
+        $imageAdapterFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->getImageAdapter());
 
-        $this->saveController = $this->objectManager->create(
-            \Magento\PageBuilder\Controller\Adminhtml\Template\Save::class,
-            [
-                'filesystem' => $this->filesystem,
-                'mediaStorage' => $this->mediaStorage,
-                'imageAdapterFactory' => $this->imageAdapterFactory
-            ]
-        );
-
-        $this->serializer = $this->objectManager->get(Json::class);
+        return $imageAdapterFactory;
     }
 
     /**
-     * Test saving a template using the controller
+     * Create ImageAdapter mock.
      *
-     * @magentoDbIsolation enabled
+     * @return (Gd2&MockObject)|MockObject
      */
-    public function testSaveAction()
+    private function getImageAdapter(): Gd2|MockObject
     {
-        $this->directoryWrite->expects(self::atLeastOnce())->method('getAbsolutePath')
-            ->with('.template-manager')
-            ->willReturn('absolute/path/.template-manager/');
-        $this->directoryWrite->expects(self::atLeastOnce())->method('create')
-            ->with('absolute/path/.template-manager/');
-        $driver = $this->getMockBuilder(DriverInterface::class)
+        $imageAdapter = $this->getMockBuilder(Gd2::class)
+            ->onlyMethods(['open', 'resize', 'save'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->directoryWrite->expects(self::atLeastOnce())->method('getDriver')
-            ->willReturn($driver);
-        $this->directoryWrite->expects(self::atLeastOnce())->method('getRelativePath')
-            ->willReturn('.template-manager/automatedtemplate');
-        $driver->expects(self::atLeastOnce())->method('filePutContents');
-        $this->imageAdapterFactory->expects($this->once())
-            ->method('create')
-            ->willReturn($this->imageAdapter);
-
-        $this->imageAdapter->expects($this->once())
+        $imageAdapter->expects($this->any())
             ->method('save')
             ->with(
                 $this->stringContains('-thumb.jpg')
             );
 
-        $this->filesystem->expects($this->once())
-            ->method('getDirectoryWrite')
-            ->willReturn($this->directoryWrite);
-
-        $post = [
-            'name' => 'Automated Template',
-            'template' => '<div data-content-type="row"></div>',
-            'createdFor' => 'any',
-            // phpcs:disable Generic.Files.LineLength
-            'previewImage' => 'data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAMCAgICAgMCAgIDAwMDBAYEBAQEBAgGBgUGCQgKCgkICQkKDA8MCgsOCwkJDRENDg8QEBEQCgwSExIQEw8QEBD/2wBDAQMDAwQDBAgEBAgQCwkLEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBD/wAARCAAZABkDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAn/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFAEBAAAAAAAAAAAAAAAAAAAAAP/EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAMAwEAAhEDEQA/AJVAAAAAAAA//9k='
-        ];
-        $this->getRequest()->setPostValue($post)->setMethod(HttpRequest::METHOD_POST);
-        $response = $this->saveController->execute();
-        $response->renderResult($this->getResponse());
-
-        $this->assertEquals(
-            'application/json',
-            $this->getResponse()->getHeader('Content-Type')->getFieldValue()
-        );
-
-        $response = $this->serializer->unserialize($this->getResponse()->getBody());
-        $this->assertNotNull($response['status']);
-        $this->assertEquals(
-            'ok',
-            $response['status'],
-            isset($response['message']) ? $response['message'] : null
-        );
+        return $imageAdapter;
+    }
 
-        $template = $this->templateRepository->get($response['data']['id']);
-        $this->assertEquals('Automated Template', $template->getName());
-        $this->assertEquals('<div data-content-type="row"></div>', $template->getTemplate());
-        $this->assertEquals('any', $template->getCreatedFor());
-        $this->assertStringContainsString('.template-manager/automatedtemplate', $template->getPreviewImage());
+    /**
+     * Retrieve Json serializer.
+     *
+     * @return Json
+     */
+    private function getSerializer(): Json
+    {
+        return $this->objectManager->get(Json::class);
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php
index e07bba8510a..e1c3862ce72 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/AllowedParentTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php
index 2b5c81e015b..757482b7eec 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/AppearanceTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php
index 9eb5d91cbb0..04ea5bdc25b 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ContentType/ReaderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php
index 996f71105ab..1e8c8d59800 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/MenuSection/ReaderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php
index ffb32690973..661b736fd92 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Config/ReaderTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Model\Config;
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php
index ceb20e4109d..9630f92d909 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Dom/ElementTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -47,7 +47,7 @@ public function testRemoveStyle(string $elementData, string $styleProperty, stri
         $this->assertEquals($expectedResult, $element->removeStyle($styleProperty));
     }
 
-    public function removeStylesDataProvider()
+    public static function removeStylesDataProvider()
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [
@@ -90,7 +90,7 @@ public function testAddStyle(string $elementData, string $styleProperty, string
         $this->assertEquals($expectedResult, $element->addStyle($styleProperty, $styleValue));
     }
 
-    public function addStyleDataProvider()
+    public static function addStyleDataProvider()
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php
index c4436b38d3d..d4d67c26fd8 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Filter/TemplateTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -37,7 +37,7 @@ public function testFilterFor(string $results, bool $contains, string $value)
     /**
      * @return array
      */
-    public function getFilterForDataProvider() : array
+    public static function getFilterForDataProvider() : array
     {
         $template = <<<TEMPLATE
 <div data-content-type="row" data-appearance="contained" data-element="main">
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php
index 8aa55674206..7dbf5c3995f 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Config/UiComponentConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -32,7 +32,7 @@ protected function setUp(): void
         $this->objectManager = Bootstrap::getObjectManager();
 
         $this->dataInterfaceFactoryMock = $this->getMockBuilder(\Magento\Framework\Config\DataInterfaceFactory::class)
-            ->setMethods(['create'])
+            ->onlyMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -70,7 +70,7 @@ public function testGetFields(array $uiConfig, array $expectedFields)
      *
      * @return array
      */
-    public function uiConfigDataProvider() : array
+    public static function uiConfigDataProvider() : array
     {
         return [
             [
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php
index 1042618d416..068670039d8 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php
@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Model\Stage;
@@ -83,7 +82,7 @@ public function testMediaUrlShouldBeTheSameAsBackendMediaURL(string $store, stri
     /**
      * @return array
      */
-    public function storeDataProvider(): array
+    public static function storeDataProvider(): array
     {
         return [
             [
@@ -127,7 +126,7 @@ public function testConfigShouldBeCachedWithinSameSession(): void
     /**
      * @param string|null $sessionId
      */
-    private function startNewSession(string $sessionId = null): void
+    private function startNewSession(?string $sessionId = null): void
     {
         /** @var SessionManagerInterface $session */
         $session = Bootstrap::getObjectManager()->get(SessionManagerInterface::class);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php
index 870504ca8f0..d8c84f369c1 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlockTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php
index 36c80c47782..bd9c9d42d4c 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/RendererPoolTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php
index ab755418e87..5d80623170a 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Plugin/Filter/TemplatePluginTest.php
@@ -1,74 +1,82 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\PageBuilder\Plugin\Filter;
 
+use Magento\Framework\App\Area;
+use Magento\Framework\Filter\Template as FrameworkTemplateFilter;
 use Magento\Store\Model\Store;
-use Magento\Widget\Model\Template\Filter as TemplateFilter;
+use Magento\TestFramework\Fixture\AppArea;
+use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Widget\Model\Template\Filter as WidgetTemplateFilter;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
 
-/**
- * @magentoAppArea frontend
- */
-class TemplatePluginTest extends \PHPUnit\Framework\TestCase
+#[
+    CoversClass(TemplatePlugin::class),
+    DataFixture('Magento/PageBuilder/_files/custom_variable_xss.php'),
+]
+class TemplatePluginTest extends TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
-     */
-    private $objectManager;
-
-    /**
-     * @var TemplateFilter
+     * @param string $preFiltered
+     * @param string $postFiltered
+     * @param string $preFilteredBasename
      */
-    private $templateFilter;
-
-    protected function setUp(): void
+    #[
+        AppArea(Area::AREA_GLOBAL),
+        DataProvider('filterDataProvider'),
+    ]
+    public function testFilter(string $preFiltered, string $postFiltered, string $preFilteredBasename): void
     {
-        $this->objectManager = Bootstrap::getObjectManager();
-        $this->templateFilter = $this->objectManager->get(TemplateFilter::class);
-
-        // set store id to 0 to recognize that escaping is required in custom variable
-        $this->templateFilter->setStoreId(Store::DEFAULT_STORE_ID);
+        $templateFilter = Bootstrap::getObjectManager()->create(FrameworkTemplateFilter::class);
+        $filtered = $templateFilter->filter($preFiltered);
+        $this->assertEquals(
+            $this->formatHtml($postFiltered),
+            $this->formatHtml($filtered),
+            "Failed asserting that two strings are equal after filtering $preFilteredBasename"
+        );
     }
 
     /**
      * @param string $preFiltered
      * @param string $postFiltered
      * @param string $preFilteredBasename
-     * @dataProvider filterDataProvider
-     * @magentoDataFixture Magento/PageBuilder/_files/custom_variable_xss.php
-     * @magentoDbIsolation enabled
      */
-    public function testFiltering(string $preFiltered, string $postFiltered, string $preFilteredBasename)
+    #[
+        AppArea(Area::AREA_FRONTEND),
+        DataProvider('filterFrontendDataProvider'),
+    ]
+    public function testFilterFrontend(string $preFiltered, string $postFiltered, string $preFilteredBasename): void
     {
+        $templateFilter = Bootstrap::getObjectManager()->create(WidgetTemplateFilter::class);
+        // set store id to 0 to recognize that escaping is required in custom variable
+        $templateFilter->setStoreId(Store::DEFAULT_STORE_ID);
+        $filtered = $templateFilter->filter($preFiltered);
         $this->assertEquals(
             $this->formatHtml($postFiltered),
-            $this->formatHtml($this->templateFilter->filter($preFiltered)),
+            $this->formatHtml($filtered),
             "Failed asserting that two strings are equal after filtering $preFilteredBasename"
         );
     }
 
     /**
-     * @return array
+     * @param array $preFilteredFiles
+     * @return array[]
      */
-    public function filterDataProvider(): array
+    private static function loadFiles(array $preFilteredFiles): array
     {
-        $preFilteredFiles = glob(__DIR__ . '/../../_files/template_plugin/*pre_filter*');
-
         $dataProviderArgs = [];
-
         foreach ($preFilteredFiles as $preFilteredFile) {
             $preFilteredBasename = basename($preFilteredFile);
-            $postFilteredFile = pathinfo($preFilteredFile, PATHINFO_DIRNAME) . '/' . str_replace(
-                'pre_filter',
-                'post_filter',
-                $preFilteredBasename
-            );
+            $postFilteredBasename = str_replace('pre_filter', 'post_filter', $preFilteredBasename);
+            $postFilteredFile = pathinfo($preFilteredFile, PATHINFO_DIRNAME) . '/' . $postFilteredBasename;
 
             $dataProviderArgs[] = [
                 file_get_contents($preFilteredFile),
@@ -80,11 +88,34 @@ public function filterDataProvider(): array
         return $dataProviderArgs;
     }
 
+    /**
+     * @return array
+     */
+    public static function filterDataProvider(): array
+    {
+        $preFilteredFiles = glob(__DIR__ . '/../../_files/template_plugin/*pre_filter*');
+        $dataProviderArgs = self::loadFiles($preFilteredFiles);
+
+        return $dataProviderArgs;
+    }
+
+    /**
+     * @return array
+     */
+    public static function filterFrontendDataProvider(): array
+    {
+        $dataProviderArgs = self::filterDataProvider();
+        $preFilteredFiles = glob(__DIR__ . '/../../_files/template_plugin/frontend/*pre_filter*');
+        $dataProviderArgs = array_merge($dataProviderArgs, self::loadFiles($preFilteredFiles));
+
+        return $dataProviderArgs;
+    }
+
     /**
      * Strip whitespace from the HTML to conduct a fairer comparison
      *
      * @param string $html
-     * @return string|string[]|null
+     * @return string
      */
     private function formatHtml(string $html): string
     {
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php
index a43bfc3ca39..4574d048a86 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Setup/Converters/PageBuilderStripStylesTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types = 1);
@@ -15,6 +15,9 @@
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @magentoDbIsolation enabled
+ */
 class PageBuilderStripStylesTest extends TestCase
 {
     private const XPATH_SELECTOR = '//*[@data-content-type][@style]|//*[@data-content-type]/*[@style]';
@@ -63,7 +66,9 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
             $styleAttr = $node->getAttribute('style');
 
             if ($styleAttr) {
-                $getInternalStyles = $xpathAfter->query('//body/style[last()]')->item(0)->textContent;
+                if ($xpathAfter->query('//body/style[last()]')->item(0)) {
+                    $getInternalStyles = $xpathAfter->query('//body/style[last()]')->item(0)->textContent;
+                }
                 $styleRules[] = $styleAttr;
             }
         }
@@ -85,7 +90,7 @@ public function testConvert(string $htmlString, int $expectedStyleTags)
     /**
      * @return array
      */
-    public function conversionData(): array
+    public static function conversionData(): array
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [
@@ -176,7 +181,7 @@ public function conversionData(): array
     /**
      * @return array
      */
-    public function conversionDataRaw(): array
+    public static function conversionDataRaw(): array
     {
         // phpcs:disable Generic.Files.LineLength.TooLong
         return [
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php
index 572c321757e..1c4de5241f1 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Ui/Component/UrlInput/Page/OptionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/allowed_parent/expected_merged_array.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/allowed_parent/expected_merged_array.php
index f26e665151c..cfe1dd56127 100755
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/allowed_parent/expected_merged_array.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/allowed_parent/expected_merged_array.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/block_with_script.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/block_with_script.php
index 458d6e37dd8..e78fc2ef885 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/block_with_script.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/block_with_script.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 /** @var $block \Magento\Cms\Model\Block */
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php
index 6967aba7283..bb1f5564e4a 100755
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 return [
     'menu_sections' => [
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/menu_sections_expected_merged_array.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/menu_sections_expected_merged_array.php
index 42fda3a14b8..a1b103c12ad 100755
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/menu_sections_expected_merged_array.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/menu_sections_expected_merged_array.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php
index c36bd8356ff..f0b8a508af1 100755
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/custom_variable_xss.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/custom_variable_xss.php
index 8f7bd2a0899..a93e786e890 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/custom_variable_xss.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/custom_variable_xss.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
-$this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
 
 /** @var \Magento\Variable\Model\ResourceModel\Variable $variableResource */
-$variableResource = $this->objectManager->get(\Magento\Variable\Model\ResourceModel\Variable::class);
+$variableResource = $objectManager->get(\Magento\Variable\Model\ResourceModel\Variable::class);
 
 /** @var \Magento\Variable\Model\Variable $variable */
-$variable = $this->objectManager->get(\Magento\Variable\Model\Variable::class);
+$variable = $objectManager->get(\Magento\Variable\Model\Variable::class);
 
 $variable->setData([
     'code' => 'xssVariable',
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template/template.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template/template.php
index 3e72b65ee40..bf0d661ef12 100644
--- a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template/template.php
+++ b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template/template.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/custom_var_directive_post_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/custom_var_directive_post_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/custom_var_directive_post_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/custom_var_directive_post_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/custom_var_directive_pre_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/custom_var_directive_pre_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/custom_var_directive_pre_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/custom_var_directive_pre_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_html_content_type_inside_post_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_html_content_type_inside_post_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_html_content_type_inside_post_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_html_content_type_inside_post_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_html_content_type_inside_pre_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_html_content_type_inside_pre_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_html_content_type_inside_pre_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_html_content_type_inside_pre_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_html_inside_post_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_html_inside_post_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_html_inside_post_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_html_inside_post_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_html_inside_pre_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_html_inside_pre_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_html_inside_pre_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_html_inside_pre_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_text_inside_post_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_text_inside_post_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_text_inside_post_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_text_inside_post_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_text_inside_pre_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_text_inside_pre_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/html_content_type_with_block_with_static_text_inside_pre_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/html_content_type_with_block_with_static_text_inside_pre_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/text_content_type_with_block_with_html_content_type_inside_post_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/text_content_type_with_block_with_html_content_type_inside_post_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/text_content_type_with_block_with_html_content_type_inside_post_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/text_content_type_with_block_with_html_content_type_inside_post_filter.html
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/text_content_type_with_block_with_html_content_type_inside_pre_filter.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/text_content_type_with_block_with_html_content_type_inside_pre_filter.html
similarity index 100%
rename from dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/text_content_type_with_block_with_html_content_type_inside_pre_filter.html
rename to dev/tests/integration/testsuite/Magento/PageBuilder/_files/template_plugin/frontend/text_content_type_with_block_with_html_content_type_inside_pre_filter.html
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/block/mass-converter/widget-directive.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/block/mass-converter/widget-directive.test.js
similarity index 96%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/block/mass-converter/widget-directive.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/block/mass-converter/widget-directive.test.js
index 405409baa64..2871388f046 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/block/mass-converter/widget-directive.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/block/mass-converter/widget-directive.test.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
@@ -9,7 +9,7 @@ define([
     'jquery',
     'Magento_PageBuilder/js/content-type/block/mass-converter/widget-directive'
 ], function ($, WidgetDirective) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/block/mass-converter/widget-directive', function () {
         var model;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/column-group/preview.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/column-group/preview.test.js
new file mode 100644
index 00000000000..3a8716c6485
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/column-group/preview.test.js
@@ -0,0 +1,43 @@
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'ko',
+    'jquery',
+    'Magento_PageBuilder/js/content-type/column-group/preview',
+    'Magento_PageBuilder/js/config',
+    'Magento_PageBuilder/js/events'
+], function (ko,$, Preview, Config, Events) {
+    'use strict'; // eslint-disable-line strict
+
+    describe('Magento_PageBuilder/js/content-type/column-group/preview', function () {
+        var model;
+
+        beforeEach(function () {
+            Config.config = {content_types: {}};
+            model = new Preview(
+                {
+                    dataStore: {subscribe: jasmine.createSpy()},
+                    getChildren: function () {
+                        return ko.observableArray([]);
+                    },
+                    children: {subscribe: jasmine.createSpy()},
+                    stageId: 'STAGEID'
+                },
+                {config: {content_types: {}}});
+        });
+
+        describe('Stage readyAfter event', function () {
+            it('Should call methods to upgrade to column-line if needed', function () {
+                spyOn(model, 'getCurrentIndexInParent');
+                spyOn(model, 'hasColumnLine');
+                Events.trigger('stage:' + model.contentType.stageId + ':readyAfter');
+                expect(model.getCurrentIndexInParent).toHaveBeenCalled();
+                expect(model.hasColumnLine).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.test.js
similarity index 98%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.test.js
index 6c24aa7630e..6fa8431c69f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.test.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
@@ -9,7 +9,7 @@ define([
     'jquery',
     'Magento_PageBuilder/js/content-type/products/mass-converter/carousel-widget-directive'
 ], function ($, WidgetDirective) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/products/mass-converter/carousel-widget-directive', function () {
         var model;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/products/mass-converter/widget-directive.test.js
similarity index 98%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/products/mass-converter/widget-directive.test.js
index 049a13bd6bf..6ea416cbd7b 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/widget-directive.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/products/mass-converter/widget-directive.test.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
@@ -9,7 +9,7 @@ define([
     'jquery',
     'Magento_PageBuilder/js/content-type/products/mass-converter/widget-directive'
 ], function ($, WidgetDirective) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/products/mass-converter/widget-directive', function () {
         var model;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/text/preview.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/text/preview.test.js
new file mode 100644
index 00000000000..e1345ced954
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/text/preview.test.js
@@ -0,0 +1,164 @@
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'underscore',
+    'Magento_PageBuilder/js/content-type/text/preview'
+], function ($, _, Preview) {
+    'use strict'; // eslint-disable-line strict
+
+    describe('Magento_PageBuilder/js/content-type/text/preview', function () {
+        var model,
+            config;
+
+        beforeEach(function () {
+            config = {};
+            model = new Preview({dataStore: {subscribe: jasmine.createSpy()}}, config);
+            model.element = $('<div id="pb-text-content" contenteditable="true">This text can be edited.</div>')[0];
+            $('body').append($(model.element));
+        });
+        afterEach(function () {
+            $(model.element).remove();
+            delete model.element;
+        });
+        describe('handleMouseDown()', function () {
+            it('Should call activateEditor() if mouseup occurred outside the element', function () {
+                model.activateEditor = jasmine.createSpy();
+                $(model.element).on('mousedown', function (event) {
+                    model.element.focus();
+                    return model.handleMouseDown(model, event);
+                });
+                model.element.dispatchEvent(new MouseEvent('mousedown', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                document.dispatchEvent(new MouseEvent('mouseup', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                expect(model.activateEditor).toHaveBeenCalled();
+            });
+            it('Should not call activateEditor() if mouseup occurred inside the element', function () {
+                model.activateEditor = jasmine.createSpy();
+                $(model.element).on('mousedown', function (event) {
+                    model.element.focus();
+                    return model.handleMouseDown(model, event);
+                });
+                model.element.dispatchEvent(new MouseEvent('mousedown', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                model.element.dispatchEvent(new MouseEvent('mouseup', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                expect(model.activateEditor).not.toHaveBeenCalled();
+            });
+            it('Should not call activateEditor() if the editor is already activated', function () {
+                model.activateEditor = jasmine.createSpy();
+                model.wysiwyg = jasmine.createSpyObj(['getAdapter']);
+                $(model.element).on('mousedown', function (event) {
+                    model.element.focus();
+                    return model.handleMouseDown(model, event);
+                });
+                model.element.dispatchEvent(new MouseEvent('mousedown', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                document.dispatchEvent(new MouseEvent('mouseup', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                expect(model.activateEditor).not.toHaveBeenCalled();
+            });
+            it('Should not call activateEditor() if the element has no focus', function () {
+                model.activateEditor = jasmine.createSpy();
+                $(model.element).on('mousedown', function (event) {
+                    return model.handleMouseDown(model, event);
+                });
+                model.element.dispatchEvent(new MouseEvent('mousedown', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                document.dispatchEvent(new MouseEvent('mouseup', {
+                    view: window,
+                    bubbles: true,
+                    cancelable: true
+                }));
+                expect(model.activateEditor).not.toHaveBeenCalled();
+            });
+        });
+
+        describe('initWysiwygFromClick()', function () {
+            var originalDeferFn = _.defer,
+                editor;
+
+            beforeEach(function () {
+                config.additional_data = {
+                    wysiwygConfig: {
+                        wysiwygConfigData: {
+                            adapter: {
+                                settings: {
+
+                                }
+                            }
+                        }
+                    }
+                };
+                editor = {
+                    on: function (event, callback) {
+                        $(model.element).on(event, callback);
+                    },
+                    dom: {
+                        getRoot: jasmine.createSpy('getRoot').and.returnValue(model.element)
+                    },
+                    selection: {
+                        select: jasmine.createSpy('select')
+                    },
+                    nodeChanged: jasmine.createSpy('nodeChanged')
+                };
+                _.defer = jasmine.createSpy('_.defer');
+            });
+            afterEach(function () {
+                _.defer = originalDeferFn;
+            });
+            it('Should select image on mousedown', function () {
+                var editorSettings = config.additional_data.wysiwygConfig.wysiwygConfigData.adapter.settings,
+                    img = document.createElement('img');
+
+                $(model.element).append(img);
+                model.initWysiwygFromClick(true);
+                expect(editorSettings.auto_focus).toEqual(model.element.id);
+                expect(editorSettings.init_instance_callback).toBeInstanceOf(Function);
+                editorSettings.init_instance_callback(editor);
+                $(img).trigger('mousedown');
+                expect(editor.selection.select).toHaveBeenCalledWith(img);
+                expect(editor.nodeChanged).toHaveBeenCalled();
+            });
+            it('Should not select image if right button of the mouse is clicked', function () {
+                var editorSettings = config.additional_data.wysiwygConfig.wysiwygConfigData.adapter.settings,
+                    img = document.createElement('img');
+
+                $(model.element).append(img);
+                model.initWysiwygFromClick(true);
+                expect(editorSettings.auto_focus).toEqual(model.element.id);
+                expect(editorSettings.init_instance_callback).toBeInstanceOf(Function);
+                editorSettings.init_instance_callback(editor);
+                $(img).trigger($.Event('mousedown', {button: 2}));
+                expect(editor.selection.select).not.toHaveBeenCalled();
+                expect(editor.nodeChanged).not.toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/video/converter/attribute/videosrc.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/video/converter/attribute/videosrc.test.js
new file mode 100644
index 00000000000..0b74390a5c5
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/content-type/video/converter/attribute/videosrc.test.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'Magento_PageBuilder/js/content-type/video/converter/attribute/videosrc'
+], function ($, VideoSrc) {
+    'use strict'; // eslint-disable-line strict
+
+    describe('Magento_PageBuilder/js/content-type/video/converter/attribute/videosrc', function () {
+        var model;
+
+        beforeEach(function () {
+            model = new VideoSrc();
+        });
+
+        describe('toDom', function () {
+            it('Should remove non-youtube and preserve youtube tags in URL', function () {
+                var data = {
+                        video_source: 'https://www.youtube.com/embed/ishbTyLs6ps?rel=1&non-youtube-tag=value',
+                        autoplay: 'false'
+                    },
+                    result = model.toDom('video_source', data);
+
+                expect(result).toBe('https://www.youtube.com/embed/ishbTyLs6ps?rel=1');
+            });
+        });
+
+        describe('toDom', function () {
+            it('Should add autoplay and mute to URL if Autoplay enabled in UI', function () {
+                var data = {
+                        video_source: 'https://www.youtube.com/embed/ishbTyLs6ps?rel=1&controls=0',
+                        autoplay: 'true'
+                    },
+                    result = model.toDom('video_source', data);
+
+                expect(result).toBe('https://www.youtube.com/embed/ishbTyLs6ps?rel=1&controls=0&autoplay=1&mute=1');
+            });
+        });
+
+        describe('toDom', function () {
+            it('Should remove autoplay and mute from URL if Autoplay disabled in UI', function () {
+                var data = {
+                        video_source: 'https://www.youtube.com/embed/ishbTyLs6ps?rel=1&controls=0&autoplay=1&mute=1',
+                        autoplay: 'false'
+                    },
+                    result = model.toDom('video_source', data);
+
+                expect(result).toBe('https://www.youtube.com/embed/ishbTyLs6ps?rel=1&controls=0');
+            });
+        });
+
+        describe('fromDom', function () {
+            it('Should remove autoplay and mute from the URL as it is controlled via UI', function () {
+                var result;
+
+                result = model.fromDom('https://www.youtube.com/embed/ishbTyLs6ps?rel=1&controls=0&autoplay=1&mute=1');
+                expect(result).toBe('https://www.youtube.com/embed/ishbTyLs6ps?rel=1&controls=0');
+
+                result = model.fromDom('https://www.youtube.com/embed/ishbTyLs6ps?autoplay=1&mute=1');
+                expect(result).toBe('https://www.youtube.com/embed/ishbTyLs6ps');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/file-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/file-uploader.test.js
new file mode 100644
index 00000000000..1a3542cec49
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/file-uploader.test.js
@@ -0,0 +1,114 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    describe('Magento/PageBuilder/js/form/element/file-uploader', function () {
+        let injector = new Squire(),
+            fileUploaderMixin,
+            mockElement,
+            mockJquery,
+            mockFileInput;
+
+        beforeEach(function (done) {
+            mockJquery = jasmine.createSpy('$').and.callFake(function () {
+                return {
+                    closest: jasmine.createSpy('closest').and.returnValue({
+                        attr: jasmine.createSpy('attr'),
+                        find: jasmine.createSpy('find').and.returnValue({
+                            on: jasmine.createSpy('on')
+                        })
+                    }),
+                    replaceWith: jasmine.createSpy('replaceWith')
+                };
+            });
+
+            mockElement = {
+                extend: jasmine.createSpy('extend').and.callFake(function (config) {
+                    return function () {
+                        this.triggerFileBrowser = jasmine.createSpy('triggerFileBrowser');
+                        Object.assign(this, config);
+                    };
+                })
+            };
+
+            injector.mock('jquery', mockJquery);
+
+            injector.require([
+                'Magento_PageBuilder/js/form/element/file-uploader'
+            ], function (FileUploaderMixin) {
+                fileUploaderMixin = FileUploaderMixin;
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+            } catch (error) { // eslint-disable-line no-unused-vars
+            }
+        });
+
+        describe('file-uploader mixin', function () {
+            let FileUploaderClass, fileUploaderInstance;
+
+            beforeEach(function () {
+                FileUploaderClass = fileUploaderMixin(mockElement);
+                fileUploaderInstance = new FileUploaderClass();
+            });
+
+            it('should be a function that returns an extended Element', function () {
+                expect(typeof fileUploaderMixin).toBe('function');
+                expect(mockElement.extend).toHaveBeenCalled();
+            });
+
+            describe('replaceInputTypeFile method', function () {
+                beforeEach(function () {
+                    mockFileInput = {
+                        id: 'test-file-input',
+                        name: 'test-file-name',
+                        className: 'test-class'
+                    };
+                    mockJquery.calls.reset();
+                });
+
+                it('should exist and be a function', function () {
+                    expect(typeof fileUploaderInstance.replaceInputTypeFile).toBe('function');
+                });
+
+                it('should call jQuery with file input selectors (happy path)', function () {
+                    expect(typeof fileUploaderInstance.replaceInputTypeFile).toBe('function');
+
+                    expect(function () {
+                        fileUploaderInstance.replaceInputTypeFile(mockFileInput);
+                    }).not.toThrow();
+                });
+
+                it('should call replaceWith on the file input', function () {
+                    expect(function () {
+                        fileUploaderInstance.replaceInputTypeFile(mockFileInput);
+                    }).not.toThrow();
+
+                    expect(typeof mockFileInput.id).toBe('string');
+                    expect(typeof mockFileInput.name).toBe('string');
+                    expect(typeof mockFileInput.className).toBe('string');
+                });
+
+                it('should register a click handler', function () {
+                    expect(function () {
+                        fileUploaderInstance.replaceInputTypeFile(mockFileInput);
+                    }).not.toThrow();
+
+                    expect(typeof fileUploaderInstance.replaceInputTypeFile).toBe('function');
+                });
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/html.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/html.test.js
new file mode 100644
index 00000000000..87f98312f07
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/html.test.js
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_PageBuilder/js/form/element/html'
+], function (HtmlUiElement) {
+    'use strict'; // eslint-disable-line strict
+
+    describe('Magento_PageBuilder/js/form/element/html', function () {
+        var model,
+            htmlContainer,
+            formId = 'form-' + Date.now();
+
+        function addNewElement(name, value) {
+            var newElement = document.createElement('li'),
+                inputElement = document.createElement('input');
+
+            inputElement.setAttribute('name', name);
+            inputElement.setAttribute('type', 'hidden');
+            inputElement.setAttribute('data-form-part', formId);
+            inputElement.value = value;
+            newElement.appendChild(inputElement);
+            htmlContainer.appendChild(newElement);
+            model.elements.push(inputElement);
+            return inputElement;
+        }
+
+        function removeElement(element) {
+            element.remove();
+            model.elements = model.elements.filter(el => el !== element);
+        }
+
+        beforeEach(function () {
+            model = new HtmlUiElement({inputSelector: '[data-form-part=' + formId + ']'});
+            htmlContainer = document.createElement('ul');
+            document.body.appendChild(htmlContainer);
+        });
+
+        afterEach(function () {
+            document.body.removeChild(htmlContainer);
+            model = null;
+            htmlContainer = null;
+        });
+
+        describe('"updateValue" method', function () {
+            it('Should collect all inputs values', function () {
+                var param1, param2;
+
+                model.updateValue();
+                expect(model.value()).toEqual({});
+                param1 = addNewElement('param1', 'value1');
+                model.updateValue();
+                expect(model.value()).toEqual({param1: 'value1'});
+                param2 = addNewElement('param2', 'value2');
+                model.updateValue();
+                expect(model.value()).toEqual({param1: 'value1', param2: 'value2'});
+                param2.value = 'value22';
+                model.updateValue();
+                expect(model.value()).toEqual({param1: 'value1', param2: 'value22'});
+                removeElement(param1);
+                model.updateValue();
+                expect(model.value()).toEqual({param2: 'value22'});
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/image-uploader.test.js
similarity index 97%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/image-uploader.test.js
index dad68c6b35f..a7f4ab6811d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/image-uploader.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/image-uploader.test.js
@@ -1,7 +1,6 @@
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
@@ -9,7 +8,7 @@ define([
     'jquery',
     'squire'
 ], function ($, Squire) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     var uploader,
         modifierClassSet1 = {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/page-ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/page-ui-select.test.js
similarity index 94%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/page-ui-select.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/page-ui-select.test.js
index 0be719750fa..f4b1f0cfa2d 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/element/page-ui-select.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/page-ui-select.test.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
@@ -9,7 +9,7 @@ define([
     'Magento_PageBuilder/js/form/element/page-ui-select',
     'ko'
 ], function ($, PageUiSelect, ko) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/form/element/page-ui-select', function () {
         var model;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/wysiwyg.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/wysiwyg.test.js
new file mode 100644
index 00000000000..c230dc71fff
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/element/wysiwyg.test.js
@@ -0,0 +1,118 @@
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'squire'
+], function (Squire) {
+    'use strict'; // eslint-disable-line strict
+
+    var $,
+        wysiwyg,
+        events = {
+            trigger: jasmine.createSpy(),
+            on: jasmine.createSpy()
+        },
+        injector = new Squire();
+
+    function PageBuilderFactoryMock() {
+        this.id = 'pagebuilder_instance_id';
+    }
+
+    PageBuilderFactoryMock.prototype.isFullScreen = jasmine.createSpy().and.returnValue(false);
+
+    function getWysiwygFactoryMock(Wysiwyg) {
+        var _proto,
+            WysiwygMock = function () {};
+
+        _proto = Object.create(Wysiwyg.prototype);
+        _proto.constructor = WysiwygMock;
+        WysiwygMock.prototype = _proto;
+
+        return WysiwygMock;
+    }
+
+    beforeEach(function (done) {
+        injector.mock({
+            'Magento_PageBuilder/js/page-builder': PageBuilderFactoryMock,
+            'Magento_PageBuilder/js/events': events
+        });
+        injector.require(['jquery', 'Magento_PageBuilder/js/form/element/wysiwyg'], function (jq, PageBuilderWysiwyg) {
+            var WysiwygFactoryMock = getWysiwygFactoryMock(PageBuilderWysiwyg);
+
+            $ = jq;
+            $.async = jasmine.createSpy();
+            wysiwyg = new WysiwygFactoryMock();
+            $.extend(wysiwyg, PageBuilderWysiwyg.defaults);
+            $.extend(wysiwyg, {
+                source: {
+                    set: function (name, value) {
+                        this[name] = value;
+                    },
+                    get: function (name) {
+                        return this[name];
+                    }
+                },
+                pageBuilder: new PageBuilderFactoryMock(),
+                isComponentInitialized: jasmine.createSpy().and.returnValue(false),
+                loading: jasmine.createSpy().and.returnValue(false),
+                visiblePageBuilder: jasmine.createSpy().and.returnValue(false),
+                wysiwygConfigData: jasmine.createSpy().and.returnValue({isFullScreen: false}),
+                ns: 'testnamespace'
+            });
+            $(document.body).append(
+                $('<div><div contenteditable="true"><a href="/login"></a><span tabindex="0"></span></div></div>')
+                    .attr('id', wysiwyg.pageBuilder.id)
+            );
+            done();
+        });
+    });
+
+    afterEach(function () {
+        $('#' + wysiwyg.pageBuilder.id).remove();
+        try {
+            injector.clean();
+            injector.remove();
+        } catch (e) { console.log(e); }
+    });
+
+    describe('Magento_PageBuilder/js/form/element/wysiwyg', function () {
+        describe('toggleFocusableElements', function () {
+            it('Should restore tabindex and contenteditable in fullscreen mode', function () {
+                var $div = $('#' + wysiwyg.pageBuilder.id);
+
+                wysiwyg.pageBuilder.isFullScreen = jasmine.createSpy().and.returnValue(false);
+                wysiwyg.toggleFocusableElements();
+                expect($div.find('a').attr('tabindex')).toBe('-1');
+                expect($div.find('a').data('original-tabindex')).toBe('');
+                expect($div.find('span').attr('tabindex')).toBe('-1');
+                expect($div.find('span').data('original-tabindex')).toBe('0');
+                expect($div.find('[contenteditable]').attr('contenteditable')).toBe('false');
+
+                // check full screen mode
+                wysiwyg.pageBuilder.isFullScreen = jasmine.createSpy().and.returnValue(true);
+                wysiwyg.toggleFocusableElements();
+                // check that taindex is removed from "a"
+                expect($div.find('a').attr('tabindex')).toBe(undefined);
+                expect($div.find('a').data('original-tabindex')).toBe(undefined);
+                // check that taindex is restored for "span"
+                expect($div.find('span').attr('tabindex')).toBe('0');
+                expect($div.find('span').data('original-tabindex')).toBe(undefined);
+                expect($div.find('[contenteditable]').attr('contenteditable')).toBe('true');
+            });
+        });
+        describe('initPageBuilder', function () {
+            it('Should register PageBuilder instance', function () {
+                wysiwyg.initPageBuilder();
+                expect(wysiwyg.source.get('pageBuilderInstances')).toContain(wysiwyg.pageBuilder);
+                expect(events.trigger)
+                    .toHaveBeenCalledWith(
+                        'pagebuilder:register',
+                        {ns: wysiwyg.ns, instance: wysiwyg.pageBuilder}
+                    );
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/form-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/form-mixin.test.js
new file mode 100644
index 00000000000..9c498963e1e
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/form-mixin.test.js
@@ -0,0 +1,121 @@
+/**
+ * Copyright 2023 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'jquery',
+    'Magento_PageBuilder/js/events',
+    'squire'
+], function ($, events, Squire) {
+    'use strict'; // eslint-disable-line strict
+
+    var form,
+        PageBuilderFactoryMock,
+        injector = new Squire();
+
+    function getPageBuilderFactoryMock() {
+        var _proto,
+            PageBuilderMock = function () {
+                this.id = 'pagebuilder_instance_id';
+            };
+
+        _proto = PageBuilderMock.prototype;
+        _proto.isFullScreen = jasmine.createSpy().and.returnValue(false);
+
+        return PageBuilderMock;
+    }
+
+    beforeEach(function (done) {
+        PageBuilderFactoryMock = getPageBuilderFactoryMock();
+        injector.mock({
+            'jquery': $,
+            'Magento_PageBuilder/js/events': events
+        });
+        injector.require(['Magento_PageBuilder/js/form/form-mixin'], function (mixin) {
+            form = mixin({
+                _super: jasmine.createSpy(),
+                source: {
+                    set: function (name, value) {
+                        this[name] = value;
+                    },
+                    get: function (name) {
+                        return this[name];
+                    }
+                },
+                extend: function (child) {
+                    return $.extend(this, child);
+                },
+                ns: 'test_form_namespace'
+            });
+            done();
+        });
+    });
+
+    afterEach(function () {
+        try {
+            injector.clean();
+            injector.remove();
+            // eslint-disable-next-line no-unused-vars
+        } catch (e) {}
+    });
+
+    describe('Magento_PageBuilder/js/form/form-mixin', function () {
+        describe('initialize', function () {
+            beforeEach(function () {
+                form.initialize();
+                expect(form._super).toHaveBeenCalled();
+            });
+            it('Should not register pagebuilder instances from different namespace', function () {
+                var pageBuilderInstance = new PageBuilderFactoryMock();
+
+                events.trigger('pagebuilder:register', {instance: pageBuilderInstance, ns: 'different_namespace'});
+                expect(form.source.get('pageBuilderInstances')).toEqual([]);
+            });
+            it('Should not register already registered pagebuilder instance', function () {
+                var pageBuilderInstance = new PageBuilderFactoryMock();
+
+                form.source.set('pageBuilderInstances', [pageBuilderInstance]);
+                events.trigger('pagebuilder:register', {instance: pageBuilderInstance, ns: 'test_form_namespace'});
+                expect(form.source.get('pageBuilderInstances')).toEqual([pageBuilderInstance]);
+            });
+            it('Should register pagebuilder instances within the form namespace', function () {
+                var pageBuilderInstance = new PageBuilderFactoryMock();
+
+                expect(form.source.get('pageBuilderInstances')).toEqual([]);
+                events.trigger('pagebuilder:register', {instance: pageBuilderInstance, ns: 'test_form_namespace'});
+                expect(form.source.get('pageBuilderInstances')).toEqual([pageBuilderInstance]);
+            });
+        });
+        describe('save', function () {
+            it('Should save immediately if no pagebuilder instances are registered', function () {
+                form.save();
+                expect(form._super).toHaveBeenCalled();
+            });
+            it('Should wait until pagebuilder instances locks are released before save', function () {
+                var pageBuilderInstance = new PageBuilderFactoryMock(),
+                    lock = $.Deferred();
+
+                pageBuilderInstance.stage = {renderingLocks: [lock]};
+                form.source.set('pageBuilderInstances', [pageBuilderInstance]);
+                form.save();
+
+                expect(form._super).not.toHaveBeenCalled();
+            });
+            it('Should save when all pagebuilder instances locks are released', function (done) {
+                var pageBuilderInstance = new PageBuilderFactoryMock(),
+                    lock = $.Deferred();
+
+                pageBuilderInstance.stage = {renderingLocks: [lock]};
+                form.source.set('pageBuilderInstances', [pageBuilderInstance]);
+                form.save();
+                lock.resolve();
+                setTimeout(function () {
+                    expect(form._super).toHaveBeenCalled();
+                    done();
+                }, 100);
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/provider.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/provider.test.js
new file mode 100644
index 00000000000..5397ad1e9fe
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/provider.test.js
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+
+define([
+    'Magento_PageBuilder/js/form/provider',
+    'Magento_PageBuilder/js/events',
+    'jquery'
+], function (Provider, events, $) {
+    'use strict'; // eslint-disable-line strict
+
+    describe('Magento_PageBuilder/js/form/provider', function () {
+        let instance;
+
+        beforeEach(function () {
+            instance = new Provider({
+                id: 'test-form'
+            });
+            spyOn(events, 'trigger');
+
+            instance.set('data', { key: 'value' });
+        });
+
+        it('should trigger save event after save is called', function () {
+            instance.save();
+            expect(events.trigger).toHaveBeenCalledWith('form:' + instance.id + ':saveAfter', instance.get('data'));
+        });
+
+        it('should trigger form saveAfter event and refresh slick if infinite is true', function () {
+            const slickMock = {
+                    options: { infinite: true, rows: 1},
+                    getSlick: function () {
+                        return { options: this.options };
+                    }
+                },
+                slickListMock = {
+                    length: 1,
+                    parent: jasmine.createSpy('parent').and.returnValue({
+                        slick: jasmine.createSpy('slick').and.returnValue(slickMock)
+                    })
+                };
+
+            spyOn($.fn, 'find').and.returnValue(slickListMock);
+
+            // eslint-disable-next-line one-var
+            const result = instance.save();
+
+            expect(events.trigger).toHaveBeenCalledWith('form:' + instance.id + ':saveAfter', instance.get('data'));
+            expect($.fn.find).toHaveBeenCalledWith('.slick-list.draggable');
+            expect($.fn.find().parent).toHaveBeenCalled();
+            expect($.fn.find().parent().slick).toHaveBeenCalledWith('refresh');
+            expect(result).toBe(instance);
+        });
+
+        it('should not refresh slick if infinite is false', function () {
+            const slickMockFalse = {
+                options: { infinite: false },
+                getSlick: function () {
+                    return { options: this.options };
+                }
+            };
+
+            spyOn($.fn, 'find').and.returnValue(slickMockFalse);
+
+            $.fn.find.and.returnValue({
+                length: 1,
+                parent: jasmine.createSpy('parent').and.returnValue({
+                    slick: jasmine.createSpy('slick').and.returnValue(slickMockFalse)
+                })
+            });
+
+            // eslint-disable-next-line one-var
+            const result = instance.save();
+
+            expect(events.trigger).toHaveBeenCalledWith('form:' + instance.id + ':saveAfter', instance.get('data'));
+            expect($('.slick-list.draggable').parent().slick.calls.count()).toBe(1);
+            expect($.fn.find).toHaveBeenCalledWith('.slick-list.draggable');
+            expect($.fn.find().parent).toHaveBeenCalled();
+            expect($.fn.find().parent().slick).toHaveBeenCalled();
+            expect($.fn.find().parent().slick).not.toHaveBeenCalledWith('refresh');
+            expect(result).toBe(instance);
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider/conditions-data-processor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/provider/conditions-data-processor.test.js
similarity index 92%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider/conditions-data-processor.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/provider/conditions-data-processor.test.js
index eed174aab35..972ed90f3dc 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider/conditions-data-processor.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/form/provider/conditions-data-processor.test.js
@@ -1,13 +1,13 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
 define([
     'Magento_PageBuilder/js/form/provider/conditions-data-processor'
 ], function (processor) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/form/provider/conditions-data-processor', function () {
         it('Should delete and then normalize the data to the specified attribute', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/mass-converter/widget-directive-abstract.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/mass-converter/widget-directive-abstract.test.js
new file mode 100644
index 00000000000..85226ca307c
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/mass-converter/widget-directive-abstract.test.js
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+define([
+    'squire'
+], function (Squire) {
+    'use strict';
+
+    var WidgetDirectiveAbstract,
+        injector = new Squire(),
+        mocks = {
+            'Magento_PageBuilder/js/utils/object': {
+                get: function (data, key) {
+                    return data[key];
+                },
+                set: function (data, key, value) {
+                    data[key] = value;
+                }
+            }
+        };
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(['Magento_PageBuilder/js/mass-converter/widget-directive-abstract'], function (module) {
+            WidgetDirectiveAbstract = module;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        injector.clean();
+    });
+
+    describe('Magento_PageBuilder/js/mass-converter/widget-directive-abstract', function () {
+        var model;
+
+        beforeEach(function () {
+            model = new WidgetDirectiveAbstract();
+        });
+
+        describe('fromDom - Multiline Widget with WYSIWYG Content', function () {
+            it('Should parse custom widget with multiline WYSIWYG content containing links', function () {
+                // Simulates the reported issue: custom widget with WYSIWYG field containing links
+                var data = {
+                        content: '{{widget type="Custom\\Widget\\Test"\n' +
+                                'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                                '<p>Description with <a href=\\"/product/sample\\">product link</a></p>"\n' +
+                                'template="widget/wysiwyg_test.phtml"}}'
+                    },
+                    config = {
+                        html_variable: 'content'
+                    },
+                    result = model.fromDom(data, config);
+
+                // With old regex (.*?): widget won't be parsed, returns empty object
+                // With new regex ([\S\s]*?): widget will be parsed correctly
+                expect(result.type).toBe('Custom\\Widget\\Test');
+                expect(result.wysiwyg_content).toContain('Sample Product Title');
+                expect(result.wysiwyg_content).toContain('href=\\"');
+                expect(result.template).toBe('widget/wysiwyg_test.phtml');
+            });
+        });
+    });
+});
+
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder/events-mixin.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/page-builder/events-mixin.test.js
similarity index 91%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder/events-mixin.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/page-builder/events-mixin.test.js
index e56ba1cdff4..0fb6ba02f8f 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/page-builder/events-mixin.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/page-builder/events-mixin.test.js
@@ -1,13 +1,13 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /* eslint-disable max-nested-callbacks */
 define([
     'squire'
 ], function (Squire) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     var injector = new Squire(),
         eventObject = {
@@ -46,6 +46,7 @@ define([
             injector.clean();
             injector.remove();
             window._satellite = origSatellite;
+            // eslint-disable-next-line no-unused-vars
         } catch (e) {
         }
     });
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor-regex.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor-regex.test.js
new file mode 100644
index 00000000000..42019120190
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor-regex.test.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_PageBuilder/js/utils/editor'
+], function (utils) {
+    'use strict';
+
+    describe('Magento_PageBuilder/js/utils/editor.js - Multiline Widget Tests', function () {
+
+        describe('escapeDoubleQuoteWithinWidgetDirective', function () {
+            it('Should process multiline widget with WYSIWYG content containing links', function () {
+                // Simulates the issue: custom widget with WYSIWYG field containing multiline content with links
+                var content = 'Page content {{widget type="Custom\\Widget\\Test"\n' +
+                             'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                             '<p>Description with <a href=&quot;/product/sample&quot;>product link</a></p>"\n' +
+                             'template="widget/wysiwyg_test.phtml"}} more content',
+                    result = utils.escapeDoubleQuoteWithinWidgetDirective(content);
+
+                // With old regex (.*?): widget won't be found, quotes won't be escaped
+                // With new regex ([\S\s]*?): widget will be found and quotes properly escaped
+                expect(result).toContain('href=\\"');
+                expect(result).not.toContain('&quot;');
+            });
+        });
+
+        describe('unescapeDoubleQuoteWithinWidgetDirective', function () {
+            it('Should process multiline widget with escaped quotes in WYSIWYG content', function () {
+                var content = 'Page content {{widget type="Custom\\Widget\\Test"\n' +
+                             'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                             '<p>Description with <a href=\\"product/sample\\">product link</a></p>"\n' +
+                             'template="widget/wysiwyg_test.phtml"}} more content',
+                    result = utils.unescapeDoubleQuoteWithinWidgetDirective(content);
+
+                // With old regex: multiline widget won't be processed
+                // With new regex: quotes will be properly unescaped
+                expect(result).toContain('href=&quot;');
+                expect(result).not.toContain('\\"');
+            });
+        });
+    });
+});
+
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor.test.js
new file mode 100644
index 00000000000..251934ec344
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/editor.test.js
@@ -0,0 +1,88 @@
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_PageBuilder/js/utils/editor',
+    'jquery',
+    'Magento_PageBuilder/js/config'
+], function (utils, $, Config) {
+    'use strict'; // eslint-disable-line strict
+
+    describe('Magento_PageBuilder/js/utils/editor.js', function () {
+        describe('lockImageSize', function () {
+            it('Should not change the defined image sizes', function () {
+                var image = document.createElement('img'),
+                    element = document.createElement('div');
+
+                image.setAttribute('width', '100%');
+                $(element).append(image);
+
+                utils.lockImageSize(element);
+                expect(image.style.width).toEqual('100%');
+            });
+        });
+
+        describe('unlockImageSize', function () {
+            it('Should unlock locked images sizes only', function () {
+                var image = document.createElement('img'),
+                    element = document.createElement('div');
+
+                $(image).css({
+                    width: '100%',
+                    height: '100%'
+                });
+                $(image).attr('data-height-locked', 'true');
+                $(element).append(image);
+
+                utils.unlockImageSize(element);
+                expect(image.style.width).toEqual('100%');
+                expect(image.style.height).toEqual('');
+            });
+        });
+
+        describe('removeReservedHtmlAttributes', function () {
+            it('Should remove reserve html attributes from a content', function () {
+                var content = '<div id="x" data-t1="1" data-t2="2"><span id="y" data-t2="2" data-t3="3"></span></div>';
+
+                Config.setConfig({
+                    stage_config: {
+                        reserved_html_attributes: {
+                            'data-t2': 'data-t2',
+                            'data-t3': 'data-t3'
+                        }
+                    }
+                });
+                content = utils.removeReservedHtmlAttributes(content);
+                expect(content).toEqual('<div id="x" data-t1="1"><span id="y"></span></div>');
+            });
+        });
+
+        describe('moveToBookmark', function () {
+            var originalTinymce = window.tinymce;
+
+            beforeEach(function () {
+                window.tinymce = {
+                    activeEditor: {
+                        selection: {
+                            moveToBookmark: jasmine.createSpy('moveToBookmark')
+                        },
+                        nodeChanged: jasmine.createSpy('nodeChanged')
+                    }
+                };
+            });
+            afterEach(function () {
+                originalTinymce && (window.tinymce = originalTinymce);
+            });
+            it('Should call activeEditor.selection.moveToBookmark and activeEditor.nodeChanged', function () {
+                var bookmark = {id: 'test'};
+
+                utils.moveToBookmark(bookmark);
+                expect(utils.getActiveEditor().selection.moveToBookmark).toHaveBeenCalledWith(bookmark);
+                expect(utils.getActiveEditor().nodeChanged).toHaveBeenCalled();
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/nesting-widget-dialog.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/nesting-widget-dialog.test.js
new file mode 100644
index 00000000000..194093e16f8
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/adminhtml/web/js/utils/nesting-widget-dialog.test.js
@@ -0,0 +1,90 @@
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+define([
+    'squire',
+    'jquery'
+], function (Squire, $) {
+    'use strict';
+
+    var nestingWidgetDialog,
+        injector = new Squire(),
+        mocks = {
+            'mage/translate': function (text) {
+                return text; // Simple mock that returns the input text
+            },
+            'Magento_PageBuilder/js/modal/dismissible-confirm': jasmine.createSpy('dismissibleConfirm')
+        };
+
+    beforeEach(function (done) {
+        injector.mock(mocks);
+        injector.require(['Magento_PageBuilder/js/utils/nesting-widget-dialog'], function (module) {
+            nestingWidgetDialog = module;
+            done();
+        });
+    });
+
+    afterEach(function () {
+        injector.clean();
+    });
+
+    describe('Magento_PageBuilder/js/utils/nesting-widget-dialog', function () {
+        var mockDataStore, mockWysiwyg, mockElement;
+
+        beforeEach(function () {
+            // Create mock element
+            mockElement = $('<div id="test-wysiwyg">Test content</div>');
+            $('body').append(mockElement);
+
+            mockDataStore = {
+                getState: jasmine.createSpy('getState'),
+                set: jasmine.createSpy('set')
+            };
+
+            mockWysiwyg = {
+                elementId: 'test-wysiwyg'
+            };
+
+            // Reset the spy
+            mocks['Magento_PageBuilder/js/modal/dismissible-confirm'].calls.reset();
+        });
+
+        afterEach(function () {
+            mockElement.remove();
+        });
+
+        describe('Multiline Widget Detection - WYSIWYG Content Issue', function () {
+            it('Should detect custom widget with multiline WYSIWYG content containing links', function () {
+                // Simulates the reported issue: custom widget with WYSIWYG field containing links
+                var inlineMessage = 'Page content {{widget type="Custom\\Widget\\Test"\n' +
+                                   'wysiwyg_content="<h2>Sample Product Title</h2>\n' +
+                                   '<p>Description with <a href=\\"/product/sample\\">product link</a></p>"\n' +
+                                   'template="widget/wysiwyg_test.phtml"}} more content',
+                    linkUrl = {
+                        type: 'page',
+                        page: ['page-1']
+                    },
+                    dialogConfig;
+
+                mockDataStore.getState.and.returnValue({
+                    'inline_message': inlineMessage,
+                    'link_url': linkUrl
+                });
+
+                nestingWidgetDialog(mockDataStore, mockWysiwyg, 'inline_message', 'link_url');
+
+                // With old regex (.*?): multiline widget won't be detected, no dialog
+                // With new regex ([\S\s]*?): multiline widget will be detected, dialog shown
+                expect(mocks['Magento_PageBuilder/js/modal/dismissible-confirm']).toHaveBeenCalled();
+
+                // Test widget removal functionality
+                dialogConfig = mocks['Magento_PageBuilder/js/modal/dismissible-confirm'].calls.mostRecent().args[0];
+                dialogConfig.actions.always();
+
+                // Verify widget is removed from content
+                expect(mockDataStore.set).toHaveBeenCalledWith('inline_message', 'Page content  more content');
+            });
+        });
+    });
+});
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/map/appearance/default/widget.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/map/appearance/default/widget.test.js
similarity index 94%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/map/appearance/default/widget.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/map/appearance/default/widget.test.js
index 3ff0ec21a3f..38c76b1fdc9 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/map/appearance/default/widget.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/map/appearance/default/widget.test.js
@@ -1,12 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'squire',
     'jquery'
 ], function (Squire, $) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     var mapWidgetInitializer,
         injector = new Squire(),
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/products/appearance/carousel/widget.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/products/appearance/carousel/widget.test.js
similarity index 95%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/products/appearance/carousel/widget.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/products/appearance/carousel/widget.test.js
index 1135235ab22..2ec4aa54a3a 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/products/appearance/carousel/widget.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/products/appearance/carousel/widget.test.js
@@ -1,12 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'Magento_PageBuilder/js/content-type/products/appearance/carousel/widget',
     'jquery'
 ], function (sliderWidgetInitializer, $) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/products/appearance/carousel/widget', function () {
         var config = {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/row/appearance/default/widget.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/row/appearance/default/widget.test.js
similarity index 94%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/row/appearance/default/widget.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/row/appearance/default/widget.test.js
index 3e5890332a3..3aab3974bcd 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/row/appearance/default/widget.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/row/appearance/default/widget.test.js
@@ -1,11 +1,11 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'Magento_PageBuilder/js/content-type/row/appearance/default/widget'
 ], function (rowWidgetInitializer) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/row/appearance/default/widget', function () {
         it('Should not call jarallax if enableParallax !== 1', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/slider/appearance/default/widget.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/slider/appearance/default/widget.test.js
similarity index 94%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/slider/appearance/default/widget.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/slider/appearance/default/widget.test.js
index 8d8e98b592a..60f1aea4df8 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/slider/appearance/default/widget.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/slider/appearance/default/widget.test.js
@@ -1,13 +1,13 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'Magento_PageBuilder/js/content-type/slider/appearance/default/widget',
     'Magento_PageBuilder/js/events',
     'jquery'
 ], function (sliderWidgetInitializer, uiEvents, $) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/slider/appearance/default/widget', function () {
         var el;
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/tabs/appearance/default/widget.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/tabs/appearance/default/widget.test.js
similarity index 91%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/tabs/appearance/default/widget.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/tabs/appearance/default/widget.test.js
index 1ec9e6d79f2..cbb0b25ea91 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/content-type/tabs/appearance/default/widget.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/content-type/tabs/appearance/default/widget.test.js
@@ -1,12 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'Magento_PageBuilder/js/content-type/tabs/appearance/default/widget',
     'jquery'
 ], function (tabsInitializerWidget, $) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     describe('Magento_PageBuilder/js/content-type/tabs/appearance/default/widget', function () {
         it('Should call $.ui.tabs with active based on element\'s activeTab data', function () {
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget-initializer.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/widget-initializer.test.js
similarity index 95%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget-initializer.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/widget-initializer.test.js
index 41cefce0ecf..74ea2485851 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget-initializer.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/widget-initializer.test.js
@@ -1,12 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'squire',
     'jquery'
 ], function (Squire, $) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     var widgetInitializer,
         injector = new Squire(),
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget/show-on-hover.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/widget/show-on-hover.test.js
similarity index 97%
rename from dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget/show-on-hover.test.js
rename to dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/widget/show-on-hover.test.js
index 0129c8c7d4a..91e826818bd 100644
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/frontend/web/js/widget/show-on-hover.test.js
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/frontend/web/js/widget/show-on-hover.test.js
@@ -1,12 +1,12 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 define([
     'Magento_PageBuilder/js/widget/show-on-hover',
     'jquery'
 ], function (showOnHoverInitializerWidget, $) {
-    'use strict';
+    'use strict'; // eslint-disable-line strict
 
     var el;
 
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.test.js
deleted file mode 100644
index 486e03d4b6a..00000000000
--- a/dev/tests/js/jasmine/tests/app/code/Magento/PageBuilder/view/adminhtml/web/js/utils/editor.test.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-/* eslint-disable max-nested-callbacks */
-define([
-    'Magento_PageBuilder/js/utils/editor',
-    'jquery'
-], function (utils, $) {
-    'use strict';
-
-    describe('Magento_PageBuilder/js/utils/editor.js', function () {
-        describe('lockImageSize', function () {
-            it('Should not change the defined image sizes', function () {
-                var image = document.createElement('img'),
-                    element = document.createElement('div');
-
-                image.setAttribute('width', '100%');
-                $(element).append(image);
-
-                utils.lockImageSize(element);
-                expect(image.style.width).toEqual('100%');
-            });
-        });
-
-        describe('unlockImageSize', function () {
-            it('Should unlock locked images sizes only', function () {
-                var image = document.createElement('img'),
-                    element = document.createElement('div');
-
-                $(image).css({
-                    width: '100%',
-                    height: '100%'
-                });
-                $(image).attr('data-height-locked', 'true');
-                $(element).append(image);
-
-                utils.unlockImageSize(element);
-                expect(image.style.width).toEqual('100%');
-                expect(image.style.height).toEqual('');
-            });
-        });
-    });
-});
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/ExtendsBaseFormTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/ExtendsBaseFormTest.php
index 075ccf15058..0b7152cb62c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/ExtendsBaseFormTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/ExtendsBaseFormTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php
index f764954076b..4cfeb875bcb 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Xml/MenuSectionsTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/composer_root_modules_pagebuilder.txt b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/composer_root_modules_pagebuilder.txt
index 8cd4be9595f..fb1b6277226 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/composer_root_modules_pagebuilder.txt
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/_files/blacklist/composer_root_modules_pagebuilder.txt
@@ -4,3 +4,4 @@ magento/module-page-builder-admin-analytics
 magento/module-catalog-page-builder-analytics
 magento/module-cms-page-builder-analytics
 magento/module-aws-s3-page-builder
+magento/module-page-builder-image-attribute