添加fb像素扩展

app/code/Bss/FacebookPixel/Block/AddToCart.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Block;
+
+use Magento\Customer\CustomerData\SectionSourceInterface;
+
+class AddToCart implements SectionSourceInterface
+{
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * AddToCart constructor.
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+    }
+
+    /**
+     * Get data
+     *
+     * @return array
+     */
+    public function getSectionData()
+    {
+        $data = [
+            'events' => []
+        ];
+
+        if ($this->fbPixelSession->create()->hasAddToCart()) {
+            // Get the add-to-cart information since it's unique to the user
+            // but might be displayed on a cached page
+            $data['events'][] = [
+                'eventName' => 'AddToCart',
+                'eventAdditional' => $this->fbPixelSession->create()->getAddToCart()
+            ];
+        }
+        return $data;
+    }
+}

app/code/Bss/FacebookPixel/Block/Subscribe.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Block;
+
+use Magento\Customer\CustomerData\SectionSourceInterface;
+
+class Subscribe implements SectionSourceInterface
+{
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * Subscribe constructor.
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+    }
+
+    /**
+     * Get data
+     *
+     * @return array
+     */
+    public function getSectionData()
+    {
+        $data = [
+            'events' => []
+        ];
+
+        if ($this->fbPixelSession->create()->hasAddSubscribe()) {
+            $data['events'][] = [
+                'eventName' => 'Subscribe',
+                'eventAdditional' => $this->fbPixelSession->create()->getAddSubscribe()
+            ];
+        }
+        return $data;
+    }
+}

app/code/Bss/FacebookPixel/Model/Config/Source/Pages.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Model\Config\Source;
+
+class Pages implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => 'cms_page', 'label' => 'Cms Page'],
+            ['value' => 'account_page', 'label' => 'Account Page'],
+            ['value' => 'registration_page', 'label' => 'Registration Page'],
+            ['value' => 'checkout_page', 'label' => 'Checkout Page'],
+            ['value' => 'success_page', 'label' => 'Success Page'],
+            ['value' => 'search_page', 'label' => 'Search Page'],
+            ['value' => 'advanced_search_page', 'label' => 'Advanced Search Page']
+        ];
+    }
+}

app/code/Bss/FacebookPixel/Model/Session.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Model;
+
+/**
+ * Class Session
+ * @package Bss\FacebookPixel\Model
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ */
+class Session extends \Magento\Framework\Session\SessionManager
+{
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setAddToCart($data)
+    {
+        $this->setData('add_to_cart', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getAddToCart()
+    {
+        if ($this->hasAddToCart()) {
+            $data = $this->getData('add_to_cart');
+            $this->unsetData('add_to_cart');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasAddToCart()
+    {
+        return $this->hasData('add_to_cart');
+    }
+
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setAddToWishlist($data)
+    {
+        $this->setData('add_to_wishlist', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getAddToWishlist()
+    {
+        if ($this->hasAddToWishlist()) {
+            $data = $this->getData('add_to_wishlist');
+            $this->unsetData('add_to_wishlist');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function hasAddToWishlist()
+    {
+        return $this->hasData('add_to_wishlist');
+    }
+
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setAddSubscribe($data)
+    {
+        $this->setData('add_subscribe', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getAddSubscribe()
+    {
+        if ($this->hasAddSubscribe()) {
+            $data = $this->getData('add_subscribe');
+            $this->unsetData('add_subscribe');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasAddSubscribe()
+    {
+        return $this->hasData('add_subscribe');
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasInitiateCheckout()
+    {
+        return $this->hasData('initiate_checkout');
+    }
+
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setInitiateCheckout($data)
+    {
+        $this->setData('initiate_checkout', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getInitiateCheckout()
+    {
+        if ($this->hasInitiateCheckout()) {
+            $data = $this->getData('initiate_checkout');
+            $this->unsetData('initiate_checkout');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasSearch()
+    {
+        return $this->hasData('search');
+    }
+
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setSearch($data)
+    {
+        $this->setData('search', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getSearch()
+    {
+        if ($this->hasSearch()) {
+            $data = $this->getData('search');
+            $this->unsetData('search');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasRegister()
+    {
+        return $this->hasData('customer_register');
+    }
+
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setRegister($data)
+    {
+        $this->setData('customer_register', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getRegister()
+    {
+        if ($this->hasRegister()) {
+            $data = $this->getData('customer_register');
+            $this->unsetData('customer_register');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @param array $data
+     * @return \Bss\FacebookPixel\Model\Session $this
+     */
+    public function setActionPage($data)
+    {
+        $this->setData('bss_action_page', $data);
+        return $this;
+    }
+
+    /**
+     * @return mixed|null
+     */
+    public function getActionPage()
+    {
+        if ($this->hasActionPage()) {
+            $data = $this->getData('bss_action_page');
+            $this->unsetData('bss_action_page');
+            return $data;
+        }
+        return null;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasActionPage()
+    {
+        return $this->hasData('bss_action_page');
+    }
+}

app/code/Bss/FacebookPixel/Observer/AddToCart.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class AddToCart implements ObserverInterface
+{
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * @var \Bss\FacebookPixel\Helper\Data
+     */
+    protected $helper;
+
+    /**
+     * @var \Magento\Catalog\Model\ProductRepository
+     */
+    protected $productRepository;
+
+    /**
+     * AddToCart constructor.
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     * @param \Bss\FacebookPixel\Helper\Data $helper
+     * @param \Magento\Catalog\Model\ProductRepository $productRepository
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession,
+        \Bss\FacebookPixel\Helper\Data $helper,
+        \Magento\Catalog\Model\ProductRepository $productRepository
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+        $this->helper        = $helper;
+        $this->productRepository = $productRepository;
+    }
+
+    /**
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return bool
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+
+        $items = $observer->getItems();
+        $typeConfi = \Magento\ConfigurableProduct\Model\Product\Type\Configurable::TYPE_CODE;
+        if (!$this->helper->isAddToCart() || !$items) {
+            return true;
+        }
+        $product = [
+            'content_ids' => [],
+            'value' => 0,
+            'currency' => ""
+        ];
+
+        /** @var \Magento\Sales\Model\Order\Item $item */
+        foreach ($items as $item) {
+            if ($item->getProduct()->getTypeId() == $typeConfi) {
+                continue;
+            }
+            if ($item->getParentItem()) {
+                if ($item->getParentItem()->getProductType() == $typeConfi) {
+                    $product['contents'][] = [
+                        'id' => $item->getSku(),
+                        'name' => $item->getName(),
+                        'quantity' => $item->getParentItem()->getQtyToAdd()
+                    ];
+                    $product['value'] += $item->getProduct()->getFinalPrice() * $item->getParentItem()->getQtyToAdd();
+                } else {
+                    $product['contents'][] = [
+                        'id' => $item->getSku(),
+                        'name' => $item->getName(),
+                        'quantity' => $item->getData('qty')
+                    ];
+                }
+            } else {
+                $product['contents'][] = [
+                    'id' => $this->checkBundleSku($item),
+                    'name' => $item->getName(),
+                    'quantity' => $item->getQtyToAdd()
+                ];
+                $product['value'] += $item->getProduct()->getFinalPrice() * $item->getQtyToAdd();
+            }
+            $product['content_ids'][] = $this->checkBundleSku($item);
+        }
+
+        $data = [
+            'content_type' => 'product',
+            'content_ids' => $product['content_ids'],
+            'contents' => $product['contents'],
+            'currency' => $this->helper->getCurrencyCode(),
+            'value' => $product['value']
+        ];
+
+        $this->fbPixelSession->create()->setAddToCart($data);
+
+        return true;
+    }
+
+    /**
+     * @param mixed $item
+     * @return string
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    protected function checkBundleSku($item)
+    {
+        $typeBundle = \Magento\Bundle\Model\Product\Type::TYPE_CODE;
+        if ($item->getProductType() == $typeBundle) {
+            $skuBundleProduct= $this->productRepository->getById($item->getProductId())->getSku();
+            return $skuBundleProduct;
+        }
+        return $item->getSku();
+    }
+}

app/code/Bss/FacebookPixel/Observer/InitiateCheckout.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class InitiateCheckout implements ObserverInterface
+{
+
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * @var \Magento\Checkout\Model\SessionFactory
+     */
+    protected $checkoutSession;
+
+    /**
+     * @var \Bss\FacebookPixel\Helper\Data
+     */
+    protected $fbPixelHelper;
+
+    /**
+     * @var \Magento\Framework\Pricing\Helper\Data
+     */
+    protected $dataPrice;
+
+    /**
+     * InitiateCheckout constructor.
+     * @param \Magento\Checkout\Model\SessionFactory $checkoutSession
+     * @param \Bss\FacebookPixel\Helper\Data $helper
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     * @param \Magento\Framework\Pricing\Helper\Data $dataPrice
+     */
+    public function __construct(
+        \Magento\Checkout\Model\SessionFactory $checkoutSession,
+        \Bss\FacebookPixel\Helper\Data $helper,
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession,
+        \Magento\Framework\Pricing\Helper\Data $dataPrice
+    ) {
+        $this->checkoutSession = $checkoutSession;
+        $this->fbPixelHelper         = $helper;
+        $this->fbPixelSession = $fbPixelSession;
+        $this->dataPrice = $dataPrice;
+    }
+
+    /**
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        if (!$this->fbPixelHelper->isInitiateCheckout()) {
+            return true;
+        }
+        $checkout = $this->checkoutSession->create();
+        if (empty($checkout->getQuote()->getAllVisibleItems())) {
+            return true;
+        }
+
+        $product = [
+            'content_ids' => [],
+            'contents' => [],
+            'value' => "",
+            'currency' => ""
+        ];
+        $items = $checkout->getQuote()->getAllVisibleItems();
+        foreach ($items as $item) {
+            $product['contents'][] = [
+                'id' => $item->getSku(),
+                'name' => $item->getName(),
+                'quantity' => $item->getQty(),
+                'item_price' => $this->dataPrice->currency($item->getPrice(), false, false)
+            ];
+            $product['content_ids'][] = $item->getSku();
+        }
+        $data = [
+            'content_ids' => $product['content_ids'],
+            'contents' => $product['contents'],
+            'content_type' => 'product',
+            'value' => $checkout->getQuote()->getGrandTotal(),
+            'currency' => $this->fbPixelHelper->getCurrencyCode(),
+        ];
+        $this->fbPixelSession->create()->setInitiateCheckout($data);
+
+        return true;
+    }
+}

app/code/Bss/FacebookPixel/Observer/Register.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class Register implements ObserverInterface
+{
+
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * @var \Bss\FacebookPixel\Helper\Data
+     */
+    protected $fbPixelHelper;
+
+    /**
+     * Register constructor.
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     * @param \Bss\FacebookPixel\Helper\Data $helper
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession,
+        \Bss\FacebookPixel\Helper\Data $helper
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+        $this->fbPixelHelper  = $helper;
+    }
+
+    /**
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $customer = $observer->getEvent()->getCustomer();
+        if (!$this->fbPixelHelper->isRegistration()
+            || !$customer
+        ) {
+            return true;
+        }
+        $data = [
+            'customer_id' => $customer->getId(),
+            'email' => $customer->getEmail(),
+            'fn' => $customer->getFirstName(),
+            'ln' => $customer->getLastName()
+        ];
+
+        $this->fbPixelSession->create()->setRegister($data);
+
+        return true;
+    }
+}

app/code/Bss/FacebookPixel/Observer/Search.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class Search implements ObserverInterface
+{
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+    /**
+     * @var \Bss\FacebookPixel\Helper\Data
+     */
+    protected $fbPixelHelper;
+    /**
+     * @var \Magento\Search\Helper\Data
+     */
+    protected $searchHelper;
+    /**
+     * @var \Magento\Framework\App\RequestInterface
+     */
+    protected $request;
+
+    /**
+     * Search constructor.
+     * @param \Bss\FacebookPixel\Helper\Data $helper
+     * @param \Magento\Search\Helper\Data $searchHelper
+     * @param \Magento\Framework\App\RequestInterface $request
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Helper\Data $helper,
+        \Magento\Search\Helper\Data $searchHelper,
+        \Magento\Framework\App\RequestInterface $request,
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+        $this->fbPixelHelper         = $helper;
+        $this->searchHelper = $searchHelper;
+        $this->request = $request;
+    }
+
+    /**
+     * @param \Magento\Framework\Event\Observer $observer
+     *
+     * @return boolean
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $text = $this->searchHelper->getEscapedQueryText();
+        if (!$text) {
+            $text = $this->request->getParams();
+            foreach ($this->request->getParams() as $key => $value) {
+                $text[$key] = $value;
+            }
+        }
+        if (!$this->fbPixelHelper->isSearch() || !$text) {
+            return true;
+        }
+
+        $data = [
+            'search_string' => $text
+        ];
+        $this->fbPixelSession->create()->setSearch($data);
+
+        return true;
+    }
+}

app/code/Bss/FacebookPixel/Observer/Subcribe.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class Subcribe implements ObserverInterface
+{
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * @var \Bss\FacebookPixel\Helper\Data
+     */
+    protected $helper;
+
+    /**
+     * Subcribe constructor.
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     * @param \Bss\FacebookPixel\Helper\Data $helper
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession,
+        \Bss\FacebookPixel\Helper\Data $helper
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+        $this->helper        = $helper;
+    }
+
+    /**
+     * @param \Magento\Framework\Event\Observer $observer
+     *
+     * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $email = $observer->getEvent()->getSubscriber()->getSubscriberEmail();
+        $subscribeId =$observer->getEvent()->getSubscriber()->getSubscriberId();
+        if (!$this->helper->isSubscribe() || !$email) {
+            return true;
+        }
+
+        $data = [
+            'id' => $subscribeId,
+            'email' => $observer->getEvent()->getSubscriber()->getSubscriberEmail()
+        ];
+
+        $this->fbPixelSession->create()->setAddSubscribe($data);
+
+        return true;
+    }
+}

app/code/Bss/FacebookPixel/Observer/WishlistAddProduct.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+namespace Bss\FacebookPixel\Observer;
+
+use Magento\Framework\Event\ObserverInterface;
+
+class WishlistAddProduct implements ObserverInterface
+{
+
+    /**
+     * @var \Bss\FacebookPixel\Model\SessionFactory
+     */
+    protected $fbPixelSession;
+
+    /**
+     * @var \Bss\FacebookPixel\Helper\Data
+     */
+    protected $helper;
+
+    /**
+     * WishlistAddProduct constructor.
+     * @param \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession
+     * @param \Bss\FacebookPixel\Helper\Data $helper
+     */
+    public function __construct(
+        \Bss\FacebookPixel\Model\SessionFactory $fbPixelSession,
+        \Bss\FacebookPixel\Helper\Data $helper
+    ) {
+        $this->fbPixelSession = $fbPixelSession;
+        $this->helper        = $helper;
+    }
+
+    /**
+     * @param \Magento\Framework\Event\Observer $observer
+     * @return boolean
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     */
+    public function execute(\Magento\Framework\Event\Observer $observer)
+    {
+        $product = $observer->getItem()->getProduct();
+        /** @var \Magento\Catalog\Model\Product $product */
+        if (!$this->helper->isAddToWishList() || !$product) {
+            return true;
+        }
+        
+        $data = [
+            'content_type' => 'product',
+            'content_ids' => $product->getSku(),
+            'content_name' => $product->getName(),
+            'currency' => $this->helper->getCurrencyCode()
+        ];
+
+        $this->fbPixelSession->create()->setAddToWishlist($data);
+        
+        return true;
+    }
+}

app/code/Bss/FacebookPixel/composer.json

+{
+  "name": "bsscommerce/facebook-pixel",
+  "description": "facebook pixel for magento 2",
+  "type": "magento2-module",
+  "version": "1.0.3",
+  "license": [
+    "OSL-3.0",
+    "AFL-3.0"
+  ],
+  "autoload": {
+    "files": [
+      "registration.php"
+    ],
+    "psr-4": {
+      "Bss\\FacebookPixel\\": ""
+    }
+  }
+}

app/code/Bss/FacebookPixel/etc/acl.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
+    <acl>
+        <resources>
+            <resource id="Magento_Backend::admin">
+                <resource id="Magento_Backend::stores">
+                    <resource id="Magento_Backend::stores_settings">
+                        <resource id="Magento_Config::config">
+                            <resource id="Bss_FacebookPixel::config_system" title="Facebook Pixel" sortOrder="1" />
+                        </resource>
+                    </resource>
+                </resource>
+            </resource>
+        </resources>
+    </acl>
+</config>

app/code/Bss/FacebookPixel/etc/adminhtml/system.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+    <system>
+        <tab id="bss" translate="label" sortOrder="300">
+            <label><![CDATA[Bss Commerce]]></label>
+        </tab>
+    <section id="bss_facebook_pixel" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+        <label><![CDATA[Facebook Pixel]]></label>
+        <tab>bss</tab>
+        <resource>Bss_FacebookPixel::config_system</resource>
+        <group id="general" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label><![CDATA[General]]></label>
+            <field id="active" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Enable Facebook Pixel]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                <comment><![CDATA[Version 1.0.3]]></comment>
+            </field>
+            <field id="pixel_id" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Pixel ID]]></label>
+                <validate>required-entry validate-number</validate>
+                <comment><![CDATA[Input Your Facebook Pixel ID.]]></comment>
+                <depends><field id="*/general/active">1</field></depends>
+            </field>
+
+        </group>
+        <group id="event_tracking" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+            <label><![CDATA[Event Tracking]]></label>
+            <field id="disable_code" translate="label" type="multiselect" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Disable Pageview on]]></label>
+                <source_model>Bss\FacebookPixel\Model\Config\Source\Pages</source_model>
+                <comment><![CDATA[Select pages to disable pageview.]]></comment>
+                <can_be_empty>1</can_be_empty>
+            </field>
+            <field id="product_view" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Product View]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="category_view" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Category View]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="add_to_cart" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Add to Cart]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="initiate_checkout" translate="label" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Initiate Checkout]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="purchase" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Purchase]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="add_to_wishlist" translate="label" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Add to Wishlist]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="registration" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Registration]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="subscribe" translate="label" type="select" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Subscribe]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+            <field id="search" translate="label" type="select" sortOrder="98" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label><![CDATA[Search]]></label>
+                <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+            </field>
+        </group>
+    </section>
+    </system>
+</config>

app/code/Bss/FacebookPixel/etc/config.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <bss_facebook_pixel>
+            <general>
+                <active>0</active>
+            </general>
+        </bss_facebook_pixel>
+    </default>
+</config>

app/code/Bss/FacebookPixel/etc/di.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <virtualType name="Bss\FacebookPixel\Model\Session\Storage" type="Magento\Framework\Session\Storage">
+        <arguments>
+            <argument name="namespace" xsi:type="string">Bss_FacebookPixel</argument>
+        </arguments>
+    </virtualType>
+    <type name="Bss\FacebookPixel\Model\Session">
+        <arguments>
+            <argument name="storage" xsi:type="object">Bss\FacebookPixel\Model\Session\Storage</argument>
+        </arguments>
+    </type>
+</config>

app/code/Bss/FacebookPixel/etc/frontend/di.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Customer\CustomerData\SectionPoolInterface">
+        <arguments>
+            <argument name="sectionSourceMap" xsi:type="array">
+                <item name="bss-fbpixel-atc" xsi:type="string">Bss\FacebookPixel\Block\AddToCart</item>
+                <item name="bss-fbpixel-subscribe" xsi:type="string">Bss\FacebookPixel\Block\Subscribe</item>
+            </argument>
+        </arguments>
+    </type>
+</config>

app/code/Bss/FacebookPixel/etc/frontend/events.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="wishlist_add_product">
+        <observer name="bss_fbpixel_add_to_wishlist" instance="Bss\FacebookPixel\Observer\WishlistAddProduct" />
+    </event>
+    <event name="sales_quote_product_add_after">
+        <observer name="bss_add_to_cart" instance="Bss\FacebookPixel\Observer\AddToCart"/>
+    </event>
+    <event name="newsletter_subscriber_save_after">
+        <observer name="bss_fbpixel_subcribe" instance="Bss\FacebookPixel\Observer\Subcribe" />
+    </event>
+    <event name="controller_action_predispatch_multishipping_checkout_index">
+        <observer name="bss_fbpixel_initiate_checkout_multi" instance="Bss\FacebookPixel\Observer\InitiateCheckout" />
+    </event>
+    <event name="controller_action_predispatch_checkout_onepage_index">
+        <observer name="bss_fbpixel_initiate_checkout_onepage" instance="Bss\FacebookPixel\Observer\InitiateCheckout" />
+    </event>
+    <event name="controller_action_predispatch_checkout_index_index">
+        <observer name="bss_fbpixel_initiate_checkout_index_index" instance="Bss\FacebookPixel\Observer\InitiateCheckout" />
+    </event>
+    <event name="controller_action_predispatch_catalogsearch_result_index">
+        <observer name="bss_fbpixel_search_result_index" instance="Bss\FacebookPixel\Observer\Search" />
+    </event>
+    <event name="controller_action_predispatch_catalogsearch_advanced_result">
+        <observer name="bss_fbpixel_search_advanced_result" instance="Bss\FacebookPixel\Observer\Search" />
+    </event>
+    <event name="customer_register_success">
+        <observer name="bss_fbpixel_customer_register_success" instance="Bss\FacebookPixel\Observer\Register" />
+    </event>
+</config>

app/code/Bss/FacebookPixel/etc/frontend/sections.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Customer:etc/sections.xsd">
+    <action name="checkout/cart/add">
+        <section name="bss-fbpixel-atc"/>
+    </action>
+    <action name="newsletter/subscriber/new">
+        <section name="bss-fbpixel-subscribe"/>
+    </action>
+</config>

app/code/Bss/FacebookPixel/etc/module.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Bss_FacebookPixel" setup_version="1.0.3">
+        <sequence>
+            <module name="Magento_Catalog"/>
+            <module name="Magento_Store"/>
+            <module name="Magento_Cms"/>
+            <module name="Magento_Checkout"/>
+        </sequence>
+    </module>
+</config>

app/code/Bss/FacebookPixel/i18n/en_US.csv

+'Bss Commerce','Bss Commerce'
+'Enabled','Enabled'
+'Facebook Pixel','Facebook Pixel'
+'General','General'
+'Enable Facebook Pixel','Enable Facebook Pixel'
+'Pixel ID','Pixel ID'
+'Event Tracking','Event Tracking'
+'Select pages to disable pageview','Select pages to disable pageview'
+'Product View','Product View'
+'Category View','Category View'
+'Add to Cart','Add to Cart'
+'Initiate Checkout','Initiate Checkout'
+'Purchase','Purchase'
+'Add to Wishlist','Add to Wishlist'
+'Registration','Registration'
+'Subscribe','Subscribe'
+'Search','Search'
+'Disable Pageview on','Disable Pageview on'
+'Set parameter value of event Add to cart','Set parameter value of event Add to cart'
+'Set Value','Set Value'

app/code/Bss/FacebookPixel/registration.php

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+\Magento\Framework\Component\ComponentRegistrar::register(
+    \Magento\Framework\Component\ComponentRegistrar::MODULE,
+    'Bss_FacebookPixel',
+    __DIR__
+);

app/code/Bss/FacebookPixel/view/frontend/layout/default.xml

+<?xml version="1.0"?>
+<!--
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceContainer name="after.body.start">
+            <block class="Bss\FacebookPixel\Block\Code"
+                   name="bss.facebook.pixel."
+                   template="Bss_FacebookPixel::code.phtml"
+                   before="-"
+                   ifconfig="bss_facebook_pixel/general/active" />
+            <block class="Magento\Framework\View\Element\Template" name="bss.fbpixel.atc" after="bss.facebook.pixel."
+                   ifconfig="bss_facebook_pixel/general/active"
+                   template="Bss_FacebookPixel::atc.phtml">
+                <arguments>
+                    <argument name="jsLayout" xsi:type="array">
+                        <item name="components" xsi:type="array">
+                            <item name="bssFbpixelsAtc" xsi:type="array">
+                                <item name="component" xsi:type="string">Bss_FacebookPixel/js/atc</item>
+                            </item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+            <block class="Magento\Framework\View\Element\Template" name="bss.fbpixel.subscribe" after="bss.facebook.pixel."
+                   ifconfig="bss_facebook_pixel/general/active"
+                   template="Bss_FacebookPixel::subscribe.phtml">
+                <arguments>
+                    <argument name="jsLayout" xsi:type="array">
+                        <item name="components" xsi:type="array">
+                            <item name="bssFbpixelsSubscribe" xsi:type="array">
+                                <item name="component" xsi:type="string">Bss_FacebookPixel/js/subscribe</item>
+                            </item>
+                        </item>
+                    </argument>
+                </arguments>
+            </block>
+        </referenceContainer>
+    </body>
+</page>

app/code/Bss/FacebookPixel/view/frontend/templates/atc.phtml

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+?>
+<div data-role="bss-fbpixel-atc" style="display:none;">
+
+</div>
+<script type="text/x-magento-init">
+    {
+        "[data-role='bss-fbpixel-atc']":
+            {
+                "Magento_Ui/js/core/app": <?= $block->getJsLayout();?>
+            }
+    }
+</script>

app/code/Bss/FacebookPixel/view/frontend/templates/code.phtml

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+// @codingStandardsIgnoreFile
+/**
+ * @var $block \Bss\FacebookPixel\Block\Code
+ */
+$pageView = $block->checkDisable();
+$data   = $block->getFacebookPixelData();
+$id     = $data['id'];
+$action = $data['full_action_name'];
+$productData = $block->getProduct();
+$categoryData = $block->getCategory();
+$registration = $block->getRegistration();
+$AddToWishlist = $block->getAddToWishList();
+$InitiateCheckout = $block->getInitiateCheckout();
+$search = $block->getSearch();
+$orderData = $block->getOrder();
+
+?>
+<div id="email"></div>
+<script type="text/x-magento-init">
+    {
+    "*":
+    {
+            "Bss_FacebookPixel/js/code": {
+                "id" : <?php echo $block->escapeHtml($id); ?>,
+                "action" : "<?php echo $data['full_action_name']; ?>",
+                "productData" : <?php echo $productData; ?>,
+                "categoryData" : <?php echo $categoryData; ?>,
+                "registration" : <?php echo $registration; ?>,
+                "addToWishList" : <?php echo $AddToWishlist; ?>,
+                "initiateCheckout" : <?php echo  $InitiateCheckout; ?>,
+                "search" : <?php echo $search; ?>,
+                "orderData" : <?php echo $orderData ?>,
+                "pageView" : "<?php echo $pageView; ?>"
+            }
+        }
+    }
+</script>
+<!-- Facebook Pixel Code -->
+<noscript><img height="1" width="1" style="display:none" alt="Facebook Pixel"
+               src="https://www.facebook.com/tr?id=<?php
+                echo $block->escapeHtml($id) ?>&ev=PageView&noscript=1"
+    /></noscript>
+<!-- End Facebook Pixel Code -->

app/code/Bss/FacebookPixel/view/frontend/templates/subscribe.phtml

+<?php
+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+?>
+<div data-role="bss-fbpixel-subscribe" style="display:none;">
+</div>
+<span class="bss-subscribe-email" style="display:none;"></span>
+<span class="bss-subscribe-id" style="display:none;"></span>
+<script type="text/x-magento-init">
+    {
+        "[data-role='bss-fbpixel-subscribe']":
+            {
+                "Magento_Ui/js/core/app": <?= $block->getJsLayout();?>
+            }
+    }
+</script>

app/code/Bss/FacebookPixel/view/frontend/web/js/atc.js

+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+define([
+    'ko',
+    'uiComponent',
+    'Magento_Customer/js/customer-data'
+], function (ko, Component, customerData) {
+    'use strict';
+    return Component.extend({
+        initialize: function () {
+            var self = this;
+            self._super();
+            customerData.get('bss-fbpixel-atc').subscribe(function (loadedData) {
+                if (loadedData && "undefined" !== typeof loadedData.events) {
+                    for (var eventCounter = 0; eventCounter < loadedData.events.length; eventCounter++) {
+                        var eventData = loadedData.events[eventCounter];
+                        if ("undefined" !== typeof eventData.eventAdditional && eventData.eventAdditional) {
+                            fbq('track', eventData.eventName, eventData.eventAdditional || {});
+                        }
+                    }
+                    customerData.set('bss-fbpixel-atc', {});
+                }
+            });
+        }
+    });
+});

app/code/Bss/FacebookPixel/view/frontend/web/js/code.js

+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+
+define([
+    'jquery'
+], function ($) {
+    "use strict";
+    return function (config) {
+        var id = config.id;
+        var action = config.action;
+        var productData = config.productData;
+        var categoryData = config.categoryData;
+        var registration = config.registration;
+        var addToWishList = config.addToWishList;
+        var initiateCheckout = config.initiateCheckout;
+        var search = config.search;
+        var orderData = config.orderData;
+        var pageView = config.pageView;
+
+
+        !function(f,b,e,v,n,t,s){if(f.fbq)return;n=f.fbq=function(){n.callMethod?
+            n.callMethod.apply(n,arguments):n.queue.push(arguments)};if(!f._fbq)f._fbq=n;
+            n.push=n;n.loaded=!0;n.version='2.0';n.queue=[];
+            t=b.createElement(e);t.async=!0;t.src=v;s=b.getElementsByTagName(e)[0];
+            s.parentNode.insertBefore(t,s)}(window,
+            document,'script','https://connect.facebook.net/en_US/fbevents.js');
+
+        window.fb = function() {
+            if (registration.email) {
+                fbq('init', id, {
+                    em : registration.email,
+                    fn : registration.fn,
+                    ln : registration.ln,
+                });
+            } else if (orderData.content_ids) {
+                fbq('init', id, {
+                    em : orderData.email,
+                    ph : orderData.phone,
+                    fn : orderData.firtname,
+                    ln : orderData.lastname,
+                    ct : orderData.city,
+                    st : orderData.st,
+                    country : orderData.country,
+                    zp : orderData.zipcode
+                });
+            } else if ($('.bss-subscribe-email').text()) {
+                fbq('init', id, {
+                    em : $('.bss-subscribe-email').text()
+                });
+            } else {
+                fbq('init', id);
+            }
+
+            if ($('.bss-subscribe-email').text()) {
+                fbq('track', 'Subscribe', {
+                    id : $('.bss-subscribe-id').text()
+                });
+
+                $('.bss-subscribe-id').text('');
+                $('.bss-subscribe-email').text('');
+            }
+
+            if (action == 'checkout_index_index' && pageView != 'pass') {
+                fbq.disablePushState = true;
+            }
+
+            if (pageView == 'pass') {
+                fbq('track', 'PageView');
+            }
+
+            if (action == 'catalog_product_view' && productData != 404) {
+                fbq('track', 'ViewContent', {
+                    content_name: productData.content_name ,
+                    content_ids: productData.content_ids,
+                    content_type: 'product',
+                    value: productData.value,
+                    currency: productData.currency
+                });
+            }
+
+            if (action == 'catalog_category_view' && categoryData != 404) {
+                fbq('trackCustom', 'ViewCategory', {
+                    content_name: categoryData.content_name,
+                    content_ids: categoryData.content_ids,
+                    content_type: 'product_group',
+                    currency: categoryData.currency
+                });
+            }
+
+            if (addToWishList != 404) {
+                fbq('track', 'AddToWishlist', {
+                    content_type : 'product',
+                    content_ids : addToWishList.content_ids,
+                    content_name : addToWishList.content_name,
+                    currency : addToWishList.currency
+                });
+            }
+
+            if (search != 404) {
+                fbq('track', 'Search', {
+                    search_string : search.search_string
+                });
+            }
+
+            if (initiateCheckout != 404) {
+                fbq('track', 'InitiateCheckout', {
+                    content_ids: initiateCheckout.content_ids,
+                    content_type: 'product',
+                    contents: initiateCheckout.contents,
+                    value: initiateCheckout.value,
+                    currency: initiateCheckout.currency
+                });
+            }
+
+            if (orderData != 404) {
+                fbq('track', 'Purchase', {
+                    content_ids: orderData.content_ids,
+                    content_type: 'product',
+                    contents: orderData.contents,
+                    value: orderData.value,
+                    num_items : orderData.num_items,
+                    currency: orderData.currency
+                });
+            }
+
+            if (registration != 404) {
+                fbq('track', 'CompleteRegistration', {
+                    customer_id: registration.customer_id
+                });
+            }
+        };
+        return window.fb();
+    }
+});

app/code/Bss/FacebookPixel/view/frontend/web/js/subscribe.js

+/**
+ * BSS Commerce Co.
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the EULA
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://bsscommerce.com/Bss-Commerce-License.txt
+ *
+ * @category  BSS
+ * @package   Bss_FacebookPixel
+ * @author    Extension Team
+ * @copyright Copyright (c) 2018-2019 BSS Commerce Co. ( http://bsscommerce.com )
+ * @license   http://bsscommerce.com/Bss-Commerce-License.txt
+ */
+define([
+    'jquery',
+    'ko',
+    'uiComponent',
+    'Magento_Customer/js/customer-data'
+], function (jQuery, ko, Component, customerData) {
+    'use strict';
+    return Component.extend({
+        initialize: function () {
+            var self = this;
+            self._super();
+            customerData.get('bss-fbpixel-subscribe').subscribe(function (loadedData) {
+                if (loadedData && "undefined" !== typeof loadedData.events) {
+                    for (var eventCounter = 0; eventCounter < loadedData.events.length; eventCounter++) {
+                        var eventData = loadedData.events[eventCounter];
+                        if ("undefined" !== typeof eventData.eventAdditional && eventData.eventAdditional) {
+                            jQuery('.bss-subscribe-email').text(eventData.eventAdditional.email);
+                            jQuery('.bss-subscribe-id').text(eventData.eventAdditional.id);
+                            customerData.set('bss-fbpixel-subscribe', {});
+                            return window.fb();
+                        }
+                    }
+                }
+            });
+        }
+    });
+});

vendor/composer/installed.php

@@ -1097,12 +1097,12 @@
             ),
             ),
         ),
         ),
         'magento/module-aws-s3-page-builder' => array(
         'magento/module-aws-s3-page-builder' => array(
-            'pretty_version' => 'dev-developer',
-            'version' => 'dev-developer',
+            'pretty_version' => '1.0.2',
+            'version' => '1.0.2.0',
             'type' => 'magento2-module',
             'type' => 'magento2-module',
             'install_path' => __DIR__ . '/../magento/module-aws-s3-page-builder',
             'install_path' => __DIR__ . '/../magento/module-aws-s3-page-builder',
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '2e453788ab2e70aac23e273aa677181d0c4773e8',
+            'reference' => NULL,
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/module-backend' => array(
         'magento/module-backend' => array(
@@ -1202,12 +1202,12 @@
             ),
             ),
         ),
         ),
         'magento/module-catalog-page-builder-analytics' => array(
         'magento/module-catalog-page-builder-analytics' => array(
-            'pretty_version' => 'dev-developer',
-            'version' => 'dev-developer',
+            'pretty_version' => '1.6.2',
+            'version' => '1.6.2.0',
             'type' => 'magento2-module',
             'type' => 'magento2-module',
             'install_path' => __DIR__ . '/../magento/module-catalog-page-builder-analytics',
             'install_path' => __DIR__ . '/../magento/module-catalog-page-builder-analytics',
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '9e232d06ebe75f86a3df78b15f4af3e121edc590',
+            'reference' => NULL,
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/module-catalog-rule' => array(
         'magento/module-catalog-rule' => array(
@@ -1283,12 +1283,12 @@
             ),
             ),
         ),
         ),
         'magento/module-cms-page-builder-analytics' => array(
         'magento/module-cms-page-builder-analytics' => array(
-            'pretty_version' => 'dev-developer',
-            'version' => 'dev-developer',
+            'pretty_version' => '1.6.2',
+            'version' => '1.6.2.0',
             'type' => 'magento2-module',
             'type' => 'magento2-module',
             'install_path' => __DIR__ . '/../magento/module-cms-page-builder-analytics',
             'install_path' => __DIR__ . '/../magento/module-cms-page-builder-analytics',
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '0598330be6ccc0456c2ee63c171bb1280446a1c7',
+            'reference' => NULL,
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/module-cms-url-rewrite' => array(
         'magento/module-cms-url-rewrite' => array(
@@ -1880,30 +1880,30 @@
             ),
             ),
         ),
         ),
         'magento/module-page-builder' => array(
         'magento/module-page-builder' => array(
-            'pretty_version' => 'dev-developer',
-            'version' => 'dev-developer',
+            'pretty_version' => '2.2.1-p3',
+            'version' => '2.2.1.0-patch3',
             'type' => 'magento2-module',
             'type' => 'magento2-module',
             'install_path' => __DIR__ . '/../magento/module-page-builder',
             'install_path' => __DIR__ . '/../magento/module-page-builder',
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '4562eb77d5fc90e2e9991da53e1d78e1224abc2f',
+            'reference' => NULL,
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/module-page-builder-admin-analytics' => array(
         'magento/module-page-builder-admin-analytics' => array(
-            'pretty_version' => 'dev-developer',
-            'version' => 'dev-developer',
+            'pretty_version' => '1.1.2',
+            'version' => '1.1.2.0',
             'type' => 'magento2-module',
             'type' => 'magento2-module',
             'install_path' => __DIR__ . '/../magento/module-page-builder-admin-analytics',
             'install_path' => __DIR__ . '/../magento/module-page-builder-admin-analytics',
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '209e01c2c7bd649e862e4d4e08f93bab52c67f13',
+            'reference' => NULL,
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/module-page-builder-analytics' => array(
         'magento/module-page-builder-analytics' => array(
-            'pretty_version' => 'dev-developer',
-            'version' => 'dev-developer',
+            'pretty_version' => '1.6.2',
+            'version' => '1.6.2.0',
             'type' => 'magento2-module',
             'type' => 'magento2-module',
             'install_path' => __DIR__ . '/../magento/module-page-builder-analytics',
             'install_path' => __DIR__ . '/../magento/module-page-builder-analytics',
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '2aabc381172ed7c72ebd0d6f8572f37cb7bb60fa',
+            'reference' => NULL,
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/module-page-cache' => array(
         'magento/module-page-cache' => array(
@@ -2338,7 +2338,7 @@
             'type' => 'metapackage',
             'type' => 'metapackage',
             'install_path' => NULL,
             'install_path' => NULL,
             'aliases' => array(),
             'aliases' => array(),
-            'reference' => '686b3e8c375b1392df9ff31550a15bbee6594ab0',
+            'reference' => '7bfd612cd65f3a383a4ef411916461be2d3a3e0e',
             'dev_requirement' => false,
             'dev_requirement' => false,
         ),
         ),
         'magento/theme-adminhtml-backend' => array(
         'magento/theme-adminhtml-backend' => array(

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml

@@ -19,12 +19,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml

@@ -19,12 +19,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml

@@ -17,12 +17,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml

@@ -19,12 +19,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-image"/>
             <group value="pagebuilder-image"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml

@@ -21,12 +21,14 @@
             <group value="pagebuilder-cms-block"/>
             <group value="pagebuilder-cms-block"/>
             <group value="pagebuilder-cms-category"/>
             <group value="pagebuilder-cms-category"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml

@@ -19,12 +19,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-templates"/>
             <group value="pagebuilder-templates"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml

@@ -19,12 +19,14 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder"/>
             <group value="pagebuilder-templates"/>
             <group value="pagebuilder-templates"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml

@@ -20,12 +20,14 @@
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-column"/>
             <group value="pagebuilder-video"/>
             <group value="pagebuilder-video"/>
             <group value="remote_storage_aws_s3"/>
             <group value="remote_storage_aws_s3"/>
+            <group value="skip_in_cloud_native_s3"/>
+            <group value="remote_storage_aws_s3_pagebuilder"/>
         </annotations>
         </annotations>
         <before>
         <before>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.enable_options}}" stepKey="enableRemoteStorage" after="loginAsAdmin"/>
+            <comment userInput="BIC workaround" stepKey="enableRemoteStorage"/>
         </before>
         </before>
         <after>
         <after>
-            <magentoCLI command="setup:config:set {{RemoteStorageAwsS3ConfigData.disable_options}}" stepKey="disableRemoteStorage" after="logout"/>
+            <comment userInput="BIC workaround" stepKey="disableRemoteStorage"/>
         </after>
         </after>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-aws-s3-page-builder/composer.json

 {
 {
     "name": "magento/module-aws-s3-page-builder",
     "name": "magento/module-aws-s3-page-builder",
     "description": "Aws S3 Page Builder module",
     "description": "Aws S3 Page Builder module",
-    "require": {
-        "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
-    },
-    "suggest": {
-        "magento/module-page-builder": "*",
-        "magento/module-aws-s3": "*"
-    },
     "type": "magento2-module",
     "type": "magento2-module",
     "license": [
     "license": [
         "proprietary"
         "proprietary"
     ],
     ],
+    "version": "1.0.2",
+    "require": {
+        "magento/framework": "103.0.*",
+        "php": "~7.4.0||~8.1.0"
+    },
+    "suggest": {
+        "magento/module-page-builder": "2.2.*",
+        "magento/module-aws-s3": "100.4.*"
+    },
     "autoload": {
     "autoload": {
         "files": [
         "files": [
             "registration.php"
             "registration.php"
@@ -22,3 +23,4 @@
         }
         }
     }
     }
 }
 }
+

vendor/magento/module-catalog-page-builder-analytics/composer.json

 {
 {
     "name": "magento/module-catalog-page-builder-analytics",
     "name": "magento/module-catalog-page-builder-analytics",
     "description": "Catalog Page Builder Analytics module",
     "description": "Catalog Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
     "config": {
         "sort-packages": true
         "sort-packages": true
     },
     },
+    "version": "1.6.2",
     "require": {
     "require": {
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-catalog": "*",
-        "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "magento/module-page-builder-analytics": "1.6.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/framework": "103.0.*",
+        "php": "~7.4.0||~8.1.0"
     },
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
     "autoload": {
         "files": [
         "files": [
             "registration.php"
             "registration.php"
@@ -23,3 +24,4 @@
         }
         }
     }
     }
 }
 }
+

vendor/magento/module-cms-page-builder-analytics/composer.json

 {
 {
     "name": "magento/module-cms-page-builder-analytics",
     "name": "magento/module-cms-page-builder-analytics",
     "description": "CMS Page Builder Analytics module",
     "description": "CMS Page Builder Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
     "config": {
         "sort-packages": true
         "sort-packages": true
     },
     },
+    "version": "1.6.2",
     "require": {
     "require": {
-        "magento/module-page-builder-analytics": "*",
-        "magento/module-cms": "*",
-        "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "magento/module-page-builder-analytics": "1.6.*",
+        "magento/module-cms": "104.0.*",
+        "magento/framework": "103.0.*",
+        "php": "~7.4.0||~8.1.0"
     },
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
     "autoload": {
         "files": [
         "files": [
             "registration.php"
             "registration.php"
@@ -23,3 +24,4 @@
         }
         }
     }
     }
 }
 }
+

vendor/magento/module-page-builder-admin-analytics/composer.json

 {
 {
     "name": "magento/module-page-builder-admin-analytics",
     "name": "magento/module-page-builder-admin-analytics",
     "description": "Page Builder Admin Analytics module",
     "description": "Page Builder Admin Analytics module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
     "config": {
     "config": {
         "sort-packages": true
         "sort-packages": true
     },
     },
+    "version": "1.1.2",
     "require": {
     "require": {
-        "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
+        "magento/framework": "103.0.*",
+        "php": "~7.4.0||~8.1.0"
     },
     },
     "suggest": {
     "suggest": {
-        "magento/module-admin-analytics": "*",
-        "magento/module-page-builder": "*"
+        "magento/module-admin-analytics": "100.4.*",
+        "magento/module-page-builder": "2.2.*"
     },
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
     "autoload": {
         "files": [
         "files": [
             "registration.php"
             "registration.php"
@@ -25,3 +26,4 @@
         }
         }
     }
     }
 }
 }
+

vendor/magento/module-page-builder-analytics/composer.json

 {
 {
     "name": "magento/module-page-builder-analytics",
     "name": "magento/module-page-builder-analytics",
     "description": "Page Builder Analytics module",
     "description": "Page Builder Analytics module",
-    "require": {
-        "magento/module-analytics": "*",
-        "magento/module-page-builder": "*",
-        "magento/framework": "*",
-        "php": "~7.3.0||~7.4.0"
-    },
     "type": "magento2-module",
     "type": "magento2-module",
     "license": [
     "license": [
         "proprietary"
         "proprietary"
     ],
     ],
+    "version": "1.6.2",
+    "require": {
+        "magento/module-analytics": "100.4.*",
+        "magento/module-page-builder": "2.2.*",
+        "magento/framework": "103.0.*",
+        "php": "~7.4.0||~8.1.0"
+    },
     "autoload": {
     "autoload": {
         "files": [
         "files": [
             "registration.php"
             "registration.php"
@@ -20,3 +21,4 @@
         }
         }
     }
     }
 }
 }
+

vendor/magento/module-page-builder/Test/Mftf/Suite/PageBuilderNewMediaGalleryRenditionsSuite.xml

@@ -8,14 +8,21 @@
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
     <suite name="PageBuilderNewMediaGalleryRenditionsSuite">
     <suite name="PageBuilderNewMediaGalleryRenditionsSuite">
         <before>
         <before>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
+            <actionGroup ref="AdminDisableWYSIWYGActionGroup" stepKey="disableWYSIWYG" />
             <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/>
             <magentoCLI command="config:set {{MediaGalleryConfigDataEnabled.path}} {{MediaGalleryConfigDataEnabled.value}}" stepKey="enableEnhancedMediaGallery"/>
             <magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/>
             <magentoCLI command="config:set {{MediaGalleryRenditionsDataEnabled.path}} {{MediaGalleryRenditionsDataEnabled.value}}" stepKey="enableMediaGalleryRenditions"/>
+
+            <!-- Create Media Gallery Directories for `wysiwyg` -->
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+            <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
+            <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
         </before>
         </before>
         <after>
         <after>
             <magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/>
             <magentoCLI command="config:set {{MediaGalleryRenditionsDataDisabled.path}} {{MediaGalleryRenditionsDataDisabled.value}}" stepKey="disableMediaGalleryRenditions"/>
             <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/>
             <magentoCLI command="config:set {{MediaGalleryConfigDataDisabled.path}} {{MediaGalleryConfigDataDisabled.value}}" stepKey="disableEnhancedMediaGallery"/>
-            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG" />
+            <actionGroup ref="AdminEnableWYSIWYGActionGroup" stepKey="enableWYSIWYG"/>
         </after>
         </after>
         <include>
         <include>
             <group name="page_builder_new_media_gallery_renditions"/>
             <group name="page_builder_new_media_gallery_renditions"/>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageCreateCMSPageWithImageTest.xml

@@ -21,6 +21,9 @@
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryBefore"/>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openMediaGalleryBefore"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridBefore"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridBefore"/>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="openWysiwygFolder">
+                <argument name="name" value="wysiwyg"/>
+            </actionGroup>
             <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
             <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
             <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
             <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder">
                 <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
                 <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
@@ -32,10 +35,13 @@
         <after>
         <after>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryAfter"/>
             <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGalleryAfter"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAfter"/>
             <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultViewAfter"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
             <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAfter">
             <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderAfter">
                 <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
                 <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="AdminEnhancedMediaGalleryImageDeleteActionGroup" stepKey="deleteImage"/>
+            <comment userInput="BIC workaround" stepKey="deleteImage"/>
             <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
             <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCmsPage"/>
@@ -60,6 +66,9 @@
         </actionGroup>
         </actionGroup>
         <actionGroup ref="AdminOpenSelectImageFromGalleryActionGroup" stepKey="openMediaGallery"/>
         <actionGroup ref="AdminOpenSelectImageFromGalleryActionGroup" stepKey="openMediaGallery"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGrid"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGrid"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolder">
         <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolder">
             <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
             <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>
         </actionGroup>
@@ -75,11 +84,13 @@
         <!-- Check if Image have "used in" data section -->
         <!-- Check if Image have "used in" data section -->
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="AdminOpenStandaloneMediaGalleryActionGroup" stepKey="openStandaloneMediaGallery"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
         <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder2">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolderToCheck">
         <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectMediaGalleryFolderToCheck">
             <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
             <argument name="name" value="{{AdminMediaGalleryFolderData.name}}"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
         <actionGroup ref="AdminEnhancedMediaGalleryViewImageDetails" stepKey="openViewImageDetails"/>
-        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup"
-                     stepKey="assertUsedInSectionDisplayed"/>
+        <actionGroup ref="AssertAdminEnhancedMediaGalleryUsedInSectionDisplayedActionGroup" stepKey="assertUsedInSectionDisplayed"/>
     </test>
     </test>
 </tests>
 </tests>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundImageSelectFromGalleryJPGTest.xml

@@ -31,11 +31,16 @@
         </before>
         </before>
         <after>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
                 <argument name="FolderName" value="Storage Root"/>
                 <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -56,9 +61,16 @@
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
             <argument name="property" value="PageBuilderBackgroundImageRoot_JPG"/>
             <argument name="property" value="PageBuilderBackgroundImageRoot_JPG"/>
         </actionGroup>
         </actionGroup>
-        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
+        <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
             <argument name="FolderName" value="Storage Root"/>
             <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
         </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
         <actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
         <actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
             <argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
             <argument name="Image" value="PageBuilderBackgroundImageRoot_JPG"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageSelectFromGalleryJPGTest.xml

@@ -32,11 +32,16 @@
         <after>
         <after>
             <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
             <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
                 <argument name="FolderName" value="Storage Root"/>
                 <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -57,9 +62,16 @@
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
             <argument name="property" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
             <argument name="property" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
         </actionGroup>
         </actionGroup>
-        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
+        <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
             <argument name="FolderName" value="Storage Root"/>
             <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
         </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
         <actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
         <actionGroup ref="AttachImageActionGroup" stepKey="SelectImageFromMediaStorage">
             <argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
             <argument name="Image" value="PageBuilderBackgroundMobileImageRoot_JPG"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBannerCommonTest/BannerCannotHaveInlineWysiwygWidgetAndLinkUrlTest.xml

@@ -33,9 +33,13 @@
         <after>
         <after>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToMediaGalleryNavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="navigateToMediaGalleryNavigateToFolder"/>
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
             <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
                 <argument name="ImageFolder" value="ImageFolder"/>
                 <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
@@ -94,14 +98,20 @@
         <!-- Add Image Link to TinyMCE -->
         <!-- Add Image Link to TinyMCE -->
         <actionGroup ref="ClickTinyMCEInsertImageButtonActionGroup" stepKey="clickTinyMCEInsertImageButton"/>
         <actionGroup ref="ClickTinyMCEInsertImageButtonActionGroup" stepKey="clickTinyMCEInsertImageButton"/>
         <actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromTinyMCEImageModal"/>
         <actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromTinyMCEImageModal"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="createTinyMCESelectorBrowseModalStorageRootImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="createTinyMCESelectorBrowseModalStorageRootImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromTinyMCESelectorBrowseModalStorageRootImageFolder">
         <actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromTinyMCESelectorBrowseModalStorageRootImageFolder">
             <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
         </actionGroup>
         </actionGroup>
-        <actionGroup ref="SaveImageActionGroup" stepKey="saveTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>    
+        <actionGroup ref="SaveImageActionGroup" stepKey="saveTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>
         <actionGroup ref="FillTinyMCEInsertImageModalAndSaveActionGroup" stepKey="fillTinyMCEInsertImageModalAndSave">
         <actionGroup ref="FillTinyMCEInsertImageModalAndSaveActionGroup" stepKey="fillTinyMCEInsertImageModalAndSave">
             <argument name="textToDisplay" value="{{PageBuilderBannerLinkUrlProperty.value}}"/>
             <argument name="textToDisplay" value="{{PageBuilderBannerLinkUrlProperty.value}}"/>
         </actionGroup>
         </actionGroup>
@@ -189,11 +199,20 @@
             <argument name="wysiwygArea" value="{{WYSIWYGOnPageBuilderInline.inlineCss}}"/>
             <argument name="wysiwygArea" value="{{WYSIWYGOnPageBuilderInline.inlineCss}}"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromInlineWYSIWYGTinyMCEImageModal"/>
         <actionGroup ref="GoToMediaGalleryFromTinyMCEImageModalActionGroup" stepKey="goToMediaGalleryFromInlineWYSIWYGTinyMCEImageModal"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickInlineWYSIWYGTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickInlineWYSIWYGTinyMCESelectorBrowseModalMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder2">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder2">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToImageFolderFolder">
+            <argument name="FolderName" value="{{ImageFolder.name}}"/>
+        </actionGroup>
         <actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolder">
         <actionGroup ref="AttachImageActionGroup" stepKey="selectImageFromInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolder">
             <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
             <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
         </actionGroup>
         </actionGroup>
-        <actionGroup ref="SaveImageActionGroup" stepKey="saveInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>    
+        <actionGroup ref="SaveImageActionGroup" stepKey="saveInlineWYSIWYGTinyMCESelectorBrowseModalStorageRootImageFolderImage"/>
         <actionGroup ref="FillTinyMCEInsertImageModalAndSaveActionGroup" stepKey="fillInlineWYSIWYGTinyMCEInsertImageModalAndSave">
         <actionGroup ref="FillTinyMCEInsertImageModalAndSaveActionGroup" stepKey="fillInlineWYSIWYGTinyMCEInsertImageModalAndSave">
             <argument name="textToDisplay" value="{{PageBuilderBannerLinkUrlProperty.value}}"/>
             <argument name="textToDisplay" value="{{PageBuilderBannerLinkUrlProperty.value}}"/>
         </actionGroup>
         </actionGroup>
@@ -223,4 +242,4 @@
             <actualResult type="variable">grabIfFrontendAnchorInContentBoolean</actualResult>
             <actualResult type="variable">grabIfFrontendAnchorInContentBoolean</actualResult>
         </assertFalse>
         </assertFalse>
     </test>
     </test>
-</tests>
+</tests>
\ No newline at end of file

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderHTMLThroughBlockContentTypeTest.xml

@@ -38,11 +38,16 @@
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="DeleteFolderFromMediaGallery">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -69,7 +74,12 @@
             <argument name="page" value="$$createCMSPage.identifier$$"/>
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
         <actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="clickMediaGalleryStorageRootArrow">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBlockRenderElementContentTypesTest/BlockRenderTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml

@@ -42,11 +42,16 @@
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -94,7 +99,13 @@
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderBannerThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml

@@ -43,11 +43,16 @@
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -105,7 +110,13 @@
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderBlockRenderMediaContentTypesTest/BlockRenderSlideItemThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml

@@ -43,11 +43,16 @@
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -105,7 +110,13 @@
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderHtmlTest/HtmlAddToCMSPageTest.xml

@@ -34,11 +34,16 @@
         <after>
         <after>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -61,7 +66,13 @@
             <argument name="page" value="$$createCMSPage.identifier$$"/>
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
         <actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderImageTest/ImageAddImageContentTypeToCMSPageTest.xml

@@ -30,27 +30,29 @@
         </before>
         </before>
         <after>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder1">
-                <argument name="FolderName" value="{{PageBuilderImageProperty_JPG.path}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
-                <argument name="Image" value="PageBuilderImageProperty_JPG"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
-                <argument name="FolderName" value="{{PageBuilderImageProperty_JPG2.path}}"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
-                <argument name="Image" value="PageBuilderImageProperty_JPG2"/>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder1"/>
+            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder3">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage1">
+                <argument name="Image" value="PageBuilderImageProperty_JPG"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage3">
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
+            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
                 <argument name="Image" value="PageBuilderImageProperty_JPG2"/>
                 <argument name="Image" value="PageBuilderImageProperty_JPG2"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder4">
-                <argument name="FolderName" value="{{PageBuilderMobileImagePropertyGif.path}}"/>
-            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder3"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage3"/>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder4"/>
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
             <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage4">
                 <argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
                 <argument name="Image" value="PageBuilderMobileImagePropertyGif"/>
             </actionGroup>
             </actionGroup>
@@ -102,8 +104,14 @@
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
         <actionGroup ref="clickSelectFromGallerySlideOut" stepKey="clickSelectFromGallerySlideOut">
             <argument name="property" value="PageBuilderImageProperty_JPG2"/>
             <argument name="property" value="PageBuilderImageProperty_JPG2"/>
         </actionGroup>
         </actionGroup>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/ProductCombinedConditionRuleWorksProperlyTest.xml

@@ -141,7 +141,8 @@
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterChangingToFalse"/>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanelSettingsAfterChangingToFalse"/>
         <!-- Validate Stage After Changing to False -->
         <!-- Validate Stage After Changing to False -->
         <comment userInput="Validate Stage Changing to False" stepKey="commentValidateStageAfterChangingToFalse"/>
         <comment userInput="Validate Stage Changing to False" stepKey="commentValidateStageAfterChangingToFalse"/>
-        <see userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="validateProductCountStageAfterChangingToFalse"/>
+        <waitForElement selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="waitForEmptyProductsPlaceholder"/>
+        <waitForText userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="validateProductCountStageAfterChangingToFalse"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen2"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage2"/>
         <!-- Validate Storefront 2 -->
         <!-- Validate Storefront 2 -->

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderProductsGridTest/AdminPageBuilderProductsSortByCategoryPositionVerifyEmptyProductsAfterDeletingCategoryTest.xml

@@ -30,7 +30,8 @@
             <argument name="CMSPage" value="$$createCMSPage$$"/>
             <argument name="CMSPage" value="$$createCMSPage$$"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2" after="navigateToCMSPage2"/>
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2" after="navigateToCMSPage2"/>
-        <see userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="seeNoProductsMessage" after="switchToPageBuilderStage2"/>
+        <waitForElement selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="waitForEmptyProductsPlaceholder" after="switchToPageBuilderStage2"/>
+        <waitForText userInput="{{PageBuilderProductsMessage.noProductsFound}}" selector="{{ProductsOnStage.emptyProductsPlaceholder('1')}}" stepKey="seeNoProductsMessage" after="waitForEmptyProductsPlaceholder"/>
         <!-- Storefront: Validate Sort Order Changed -->
         <!-- Storefront: Validate Sort Order Changed -->
         <comment userInput="Storefront: Validate Sort Order Changed" stepKey="commentValidateStorefront2" after="seeNoProductsMessage"/>
         <comment userInput="Storefront: Validate Sort Order Changed" stepKey="commentValidateStorefront2" after="seeNoProductsMessage"/>
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2" after="commentValidateStorefront2">
         <actionGroup ref="NavigateToStorefrontForCreatedPageActionGroup" stepKey="navigateToCMSPageStorefront2" after="commentValidateStorefront2">

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest/ReadHtmlWithNewImageTest.xml

@@ -31,11 +31,16 @@
             <magentoCLI command="cache:clean config" stepKey="flushCache"/>
             <magentoCLI command="cache:clean config" stepKey="flushCache"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -51,33 +56,44 @@
         <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse"/>
         <click selector="{{MediaGallerySection.Browse}}" stepKey="clickBrowse"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
         <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear1"/>
-        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToStorageRootFolder">
+        <comment userInput="BIC workaround" stepKey="navigateToStorageRootFolder"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
             <argument name="FolderName" value="Storage Root"/>
             <argument name="FolderName" value="Storage Root"/>
         </actionGroup>
         </actionGroup>
-        <click selector="{{MediaGallerySection.CreateFolder}}" stepKey="createFolder"/>
-        <waitForElementVisible selector="{{MediaGallerySection.FolderName}}" stepKey="waitForPopup"/>
-        <fillField selector="{{MediaGallerySection.FolderName}}" userInput="{{ImageFolder.name}}" stepKey="fillFolderName"/>
-        <click selector="{{MediaGallerySection.AcceptFolderName}}" stepKey="acceptFolderName"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear2"/>
-        <conditionalClick selector="{{MediaGallerySection.StorageRootArrow}}" dependentSelector="{{MediaGallerySection.checkIfArrowExpand}}" stepKey="clickStorageRootArrowIfClosed" visible="true"/>
-        <waitForPageLoad stepKey="waitForPageLoad3"/>
-        <conditionalClick selector="{{MediaGallerySection.WysiwygArrow}}" dependentSelector="{{MediaGallerySection.checkIfWysiwygArrowExpand}}" stepKey="clickWysiwygArrowIfClosed" visible="true"/>
-        <waitForPageLoad stepKey="waitForPageLoad4"/>
-        <waitForText userInput="{{ImageFolder.name}}" stepKey="waitForNewFolder"/>
-        <click userInput="{{ImageFolder.name}}" stepKey="clickOnCreatedFolder"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear3"/>
-        <attachFile selector="{{MediaGallerySection.BrowseUploadImage}}" userInput="{{ImageUpload.file}}" stepKey="uploadImage1"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear4"/>
-        <waitForElementVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForUploadImage1"/>
-        <seeElement selector="{{MediaGallerySection.imageSelected(ImageUpload.file)}}" stepKey="seeImageSelected"/>
-        <waitForElementVisible selector="{{MediaGallerySection.image(ImageUpload.file)}}" stepKey="waitForUploadImage2"/>
-        <click selector="{{MediaGallerySection.InsertFile}}" stepKey="clickInsertBtn"/>
-        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear5"/>
-        <waitForElementVisible selector="{{MediaGallerySection.OkBtn}}" stepKey="waitForOkBtn"/>
-        <fillField selector="{{MediaGallerySection.ImageDescription}}" userInput="{{ImageUpload.content}}" stepKey="fillImageDescription"/>
-        <fillField selector="{{MediaGallerySection.Height}}" userInput="{{ImageUpload.height}}" stepKey="fillImageHeight"/>
-        <click selector="{{MediaGallerySection.OkBtn}}" stepKey="clickOkBtn"/>
-        <waitForPageLoad stepKey="waitForPageLoad5"/>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
+        <actionGroup ref="CreateImageFolderActionGroup" stepKey="createFolder">
+            <argument name="ImageFolder" value="ImageFolder"/>
+        </actionGroup>
+        <comment userInput="BIC workaround" stepKey="waitForPopup"/>
+        <comment userInput="BIC workaround" stepKey="fillFolderName"/>
+        <comment userInput="BIC workaround" stepKey="acceptFolderName"/>
+        <comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear2"/>
+        <actionGroup ref="AttachImageActionGroup" stepKey="attachImage1">
+            <argument name="Image" value="ImageUpload3"/>
+        </actionGroup>
+        <comment userInput="BIC workaround" stepKey="clickStorageRootArrowIfClosed"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad3"/>
+        <comment userInput="BIC workaround" stepKey="clickWysiwygArrowIfClosed"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad4"/>
+        <comment userInput="BIC workaround" stepKey="waitForNewFolder"/>
+        <comment userInput="BIC workaround" stepKey="clickOnCreatedFolder"/>
+        <comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear3"/>
+        <comment userInput="BIC workaround" stepKey="uploadImage1"/>
+        <comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear4"/>
+        <comment userInput="BIC workaround" stepKey="waitForUploadImage1"/>
+        <comment userInput="BIC workaround" stepKey="seeImageSelected"/>
+        <comment userInput="BIC workaround" stepKey="waitForUploadImage2"/>
+        <actionGroup ref="SaveImageActionGroup" stepKey="insertImage"/>
+        <comment userInput="BIC workaround" stepKey="clickInsertBtn"/>
+        <comment userInput="BIC workaround" stepKey="waitForLoadingMaskToDisappear5"/>
+        <actionGroup ref="FillOutUploadImagePopupActionGroup" stepKey="fillOutUploadImagePopup"/>
+        <comment userInput="BIC workaround" stepKey="waitForOkBtn"/>
+        <comment userInput="BIC workaround" stepKey="fillImageDescription"/>
+        <comment userInput="BIC workaround" stepKey="fillImageHeight"/>
+        <comment userInput="BIC workaround" stepKey="clickOkBtn"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad5"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="SaveAndContinueEditCmsPageActionGroup" stepKey="saveAndContinueEditCmsPage"/>
         <actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
         <actionGroup ref="enablePageBuilderSetting" stepKey="enablePageBuilder"/>
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage2">
         <actionGroup ref="NavigateToCreatedCMSPageActionGroup" stepKey="navigateToContentCreatedCMSPage2">

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderSlideItemCommonTest/SlideItemInlineWysiwygUploadImageTest.xml

@@ -36,11 +36,16 @@
         </before>
         </before>
         <after>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="PageBuilderImageProperty_StageJPG"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCreatePreReqCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -67,8 +72,14 @@
         <waitForPageLoad stepKey="waitForImageSelectorModal"/>
         <waitForPageLoad stepKey="waitForImageSelectorModal"/>
         <click selector="{{WYSIWYGOnPageBuilderInline.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
         <click selector="{{WYSIWYGOnPageBuilderInline.imageSelectorBrowse}}" stepKey="clickWYSIWYGImageSelectorBrowseButton"/>
         <waitForPageLoad stepKey="waitForImageSelectorBrowseModal"/>
         <waitForPageLoad stepKey="waitForImageSelectorBrowseModal"/>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForStorageRoot"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="createImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToColumnOnStageTextTest.xml

@@ -28,11 +28,16 @@
         </before>
         </before>
         <after>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
@@ -113,8 +118,14 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderTextTest/TextAddWYSIWYGContentTypeToTabOnStageTest.xml

@@ -28,11 +28,16 @@
         </before>
         </before>
         <after>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
@@ -119,8 +124,14 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDataConsistencyBetweenTextEditorTestWithoutTinyMCE3Test.xml

@@ -31,11 +31,16 @@
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
             <deleteData createDataKey="createCMSPageB" stepKey="deletePreReqCMSPageB"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -118,8 +123,14 @@
         <waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
         <waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
         <click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
         <click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <argument name="ImageFolder" value="ImageFolder"/>
         <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderTextTest/TextDisabledWYSIWYGAddImageTest.xml

@@ -36,11 +36,16 @@
         <after>
         <after>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>
             <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG1"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -56,8 +61,14 @@
         <waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
         <waitForElementVisible selector="{{TextOnConfiguration.insertImageButton}}" stepKey="waitForInsertImage"/>
         <click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
         <click selector="{{TextOnConfiguration.insertImageButton}}" stepKey="clickInsertImage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/AdminPageBuilderTextTest/TextInlineImageEditingTest.xml

@@ -27,11 +27,16 @@
         </before>
         </before>
         <after>
         <after>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deletePreReqCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
@@ -56,8 +61,14 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <click selector="{{MediaGallerySection.StorageRootArrow}}" stepKey="clickStorageRoot"/>
-        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <comment userInput="BIC workaround" stepKey="clickStorageRoot"/>
+        <comment userInput="BIC workaround" stepKey="waitForPageLoad2"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileHTMLThroughBlockContentTypeTest.xml

@@ -42,11 +42,16 @@
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSBlock" stepKey="deleteCMSBlock"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder2">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage2">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder2"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage2"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -70,7 +75,13 @@
             <argument name="page" value="$$createCMSPage.identifier$$"/>
             <argument name="page" value="$$createCMSPage.identifier$$"/>
         </actionGroup>
         </actionGroup>
         <actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
         <actionGroup ref="clickHtmlInsertImageButton" stepKey="clickInsertImageInHtmlCode"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/Test/Mftf/Test/ViewportSwitcherMobile/ViewportSwitcherMobileTextThroughBlockContentTypeTinyMCE4WysiwygEnabledByDefaultTest.xml

@@ -46,11 +46,16 @@
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
             <deleteData createDataKey="createPreReqCMSPage" stepKey="deleteCMSPageB"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
-            <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
-                <argument name="FolderName" value="{{ImageFolder.name}}"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+                <argument name="FolderName" value="Storage Root"/>
             </actionGroup>
             </actionGroup>
-            <actionGroup ref="DeleteImageFromStorageActionGroup" stepKey="DeleteImageFromStorage">
-                <argument name="Image" value="ImageUpload3"/>
+            <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandWysiwygFolder">
+                <argument name="FolderName" value="wysiwyg"/>
+            </actionGroup>
+            <comment userInput="BIC workaround" stepKey="NavigateToFolder"/>
+            <comment userInput="BIC workaround" stepKey="DeleteImageFromStorage"/>
+            <actionGroup ref="DeleteFolderActionGroup" stepKey="deleteMediaGalleryFolder">
+                <argument name="ImageFolder" value="ImageFolder"/>
             </actionGroup>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>
         </after>
@@ -93,7 +98,13 @@
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="clickInsertImageInTinyMCE" stepKey="clickInsertImageInTinyMCE"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="ClickBrowseBtnOnUploadPopupActionGroup" stepKey="clickBrowserBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
         <actionGroup ref="VerifyMediaGalleryStorageActionsActionGroup" stepKey="VerifyMediaGalleryStorageBtn"/>
-        <actionGroup ref="clickMediaGalleryStorageRootArrow" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <comment userInput="BIC workaround" stepKey="clickMediaGalleryStorageRootArrow"/>
+        <actionGroup ref="AdminExpandMediaGalleryFolderActionGroup" stepKey="expandStorageRootFolder">
+            <argument name="FolderName" value="Storage Root"/>
+        </actionGroup>
+        <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="navigateToWysiwygFolder">
+            <argument name="FolderName" value="wysiwyg"/>
+        </actionGroup>
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
         <actionGroup ref="CreateImageFolderActionGroup" stepKey="CreateImageFolder">
             <argument name="ImageFolder" value="ImageFolder"/>
             <argument name="ImageFolder" value="ImageFolder"/>
         </actionGroup>
         </actionGroup>

vendor/magento/module-page-builder/composer.json

 {
 {
     "name": "magento/module-page-builder",
     "name": "magento/module-page-builder",
     "description": "Page Builder module",
     "description": "Page Builder module",
+    "type": "magento2-module",
+    "license": [
+        "proprietary"
+    ],
+    "version": "2.2.1-p3",
     "require": {
     "require": {
-        "magento/framework": "*",
-        "magento/module-eav": "*",
-        "magento/module-store": "*",
-        "magento/module-backend": "*",
-        "magento/module-cms": "*",
-        "magento/module-catalog": "*",
-        "magento/module-catalog-inventory": "*",
-        "magento/module-config": "*",
-        "magento/module-ui": "*",
-        "magento/module-variable": "*",
-        "magento/module-widget": "*",
-        "magento/module-catalog-widget": "*",
-        "magento/module-rule": "*",
-        "magento/module-directory": "*",
-        "magento/module-email": "*",
-        "magento/module-theme": "*",
-        "magento/module-wishlist": "*",
-        "magento/module-require-js": "*",
-        "magento/module-media-storage": "*",
+        "magento/framework": "103.0.*",
+        "magento/module-eav": "102.1.*",
+        "magento/module-store": "101.1.*",
+        "magento/module-backend": "102.0.*",
+        "magento/module-cms": "104.0.*",
+        "magento/module-catalog": "104.0.*",
+        "magento/module-catalog-inventory": "100.4.*",
+        "magento/module-config": "101.2.*",
+        "magento/module-ui": "101.2.*",
+        "magento/module-variable": "100.4.*",
+        "magento/module-widget": "101.2.*",
+        "magento/module-catalog-widget": "100.4.*",
+        "magento/module-rule": "100.4.*",
+        "magento/module-directory": "100.4.*",
+        "magento/module-email": "101.1.*",
+        "magento/module-theme": "101.1.*",
+        "magento/module-wishlist": "101.2.*",
+        "magento/module-require-js": "100.4.*",
+        "magento/module-media-storage": "100.4.*",
         "php": "~7.3.0||~7.4.0",
         "php": "~7.3.0||~7.4.0",
         "phpgt/dom": "2.1.6"
         "phpgt/dom": "2.1.6"
     },
     },
     "suggest": {
     "suggest": {
-        "magento/module-review": "*"
-    },
-    "conflict": {
-        "gene/bluefoot": "*"
+        "magento/module-review": "100.4.*"
     },
     },
-    "type": "magento2-module",
-    "license": [
-        "proprietary"
-    ],
     "autoload": {
     "autoload": {
         "files": [
         "files": [
             "registration.php"
             "registration.php"
@@ -41,5 +39,9 @@
         "psr-4": {
         "psr-4": {
             "Magento\\PageBuilder\\": ""
             "Magento\\PageBuilder\\": ""
         }
         }
+    },
+    "conflict": {
+        "gene/bluefoot": "*"
     }
     }
 }
 }
+