diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php b/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php
index b7aa3487672b2..fd454f96abf95 100755
--- a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php
+++ b/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Login.php
@@ -9,6 +9,8 @@
 
 /**
  * Login as customer log
+ *
+ * @api
  */
 class Login extends \Magento\Backend\Block\Widget\Grid\Container
 {
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php
index 008e5fa3cfd87..55d89dedf09f1 100755
--- a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php
+++ b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Index.php
@@ -7,11 +7,14 @@
 
 namespace Magento\LoginAsCustomer\Controller\Adminhtml\Login;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Backend\Model\View\Result\Page;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Backend\App\Action;
+use Magento\LoginAsCustomer\Model\Login;
 
 /**
  * Login As Customer log grid action
@@ -27,18 +30,17 @@ class Index extends Action implements HttpGetActionInterface, HttpPostActionInte
     const ADMIN_RESOURCE = 'Magento_LoginAsCustomer::login_log';
 
     /**
-     * @var \Magento\LoginAsCustomer\Model\Login
+     * @var Login
      */
     private $loginModel;
 
     /**
-     * Index constructor.
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\LoginAsCustomer\Model\Login $loginModel
+     * @param Context $context
+     * @param Login $loginModel
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\LoginAsCustomer\Model\Login $loginModel
+        Context $context,
+        Login $loginModel
     ) {
         parent::__construct($context);
         $this->loginModel = $loginModel;
@@ -59,6 +61,7 @@ public function execute():ResultInterface
 
         $this->loginModel->deleteNotUsed();
 
+        /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_LoginAsCustomer::login_log')
             ->addBreadcrumb(__('Customer'), __('Login As Customer Log'));
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php
index 9f653c17907d6..8c3f0969cfbe6 100755
--- a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Login.php
@@ -82,7 +82,7 @@ public function __construct(
      *
      * @return ResultInterface
      */
-    public function execute():ResultInterface
+    public function execute(): ResultInterface
     {
         $request = $this->getRequest();
         $customerId = (int) $request->getParam('customer_id');
@@ -94,13 +94,13 @@ public function execute():ResultInterface
         $resultRedirect = $this->resultRedirectFactory->create();
 
         if (!$this->config->isEnabled()) {
-            $this->messageManager->addErrorMessage(__('Login As Customer is disabled, to enable the extension please navigate to Stores > Configuration > Customers > Login As Customer.'));
+            $this->messageManager->addErrorMessage(__('Login As Customer is disabled.'));
             return $resultRedirect->setPath('customer/index/index');
         }
 
         $customerStoreId = $request->getParam('store_id');
 
-        if (!isset($customerStoreId) && $this->config->getStoreViewLogin()) {
+        if (!isset($customerStoreId) && $this->config->isManualChoiceEnabled()) {
             $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
             return $resultRedirect->setPath('loginascustomer/login/manual', ['entity_id' => $customerId ]);
         }
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Manual.php b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Manual.php
index 82ca675411f39..93ef202071495 100755
--- a/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Manual.php
+++ b/app/code/Magento/LoginAsCustomer/Controller/Adminhtml/Login/Manual.php
@@ -7,6 +7,7 @@
 
 namespace Magento\LoginAsCustomer\Controller\Adminhtml\Login;
 
+use Magento\Backend\Model\View\Result\Page;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
@@ -31,6 +32,7 @@ class Manual extends Action implements HttpGetActionInterface
      */
     public function execute():ResultInterface
     {
+        /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
         $resultPage->setActiveMenu('Magento_LoginAsCustomer::login_button')
             ->addBreadcrumb(__('Customer'), __('Login As Customer Log'), __('Store View To Login In'));
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Login/Index.php b/app/code/Magento/LoginAsCustomer/Controller/Login/Index.php
index 2bfa06b47f4c6..dc3affa70e3a2 100755
--- a/app/code/Magento/LoginAsCustomer/Controller/Login/Index.php
+++ b/app/code/Magento/LoginAsCustomer/Controller/Login/Index.php
@@ -7,74 +7,109 @@
 
 namespace Magento\LoginAsCustomer\Controller\Login;
 
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\Action\Action;
+use Magento\Framework\Message\ManagerInterface;
+use Magento\LoginAsCustomer\Model\Login;
+use Psr\Log\LoggerInterface;
 
 /**
  * Login As Customer storefront login action
  */
-class Index extends Action implements HttpGetActionInterface
+class Index implements HttpGetActionInterface
 {
     /**
-     * @var \Magento\LoginAsCustomer\Model\Login
+     * @var ResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
+    /**
+     * @var Login
      */
     private $loginModel;
 
+    /**
+     * @var ManagerInterface
+     */
+    private $messageManager;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
 
     /**
-     * Index constructor.
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\LoginAsCustomer\Model\Login $loginModel
+     * @param ResultFactory $resultFactory
+     * @param RequestInterface $request
+     * @param Login $loginModel
+     * @param ManagerInterface $messageManager
+     * @param LoggerInterface $logger
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\LoginAsCustomer\Model\Login $loginModel
+        ResultFactory $resultFactory,
+        RequestInterface $request,
+        Login $loginModel,
+        ManagerInterface $messageManager,
+        LoggerInterface $logger
     ) {
-        parent::__construct($context);
+        $this->resultFactory = $resultFactory;
+        $this->request = $request;
         $this->loginModel = $loginModel;
+        $this->messageManager = $messageManager;
+        $this->logger = $logger;
     }
+
     /**
      * Login As Customer storefront login
      *
      * @return ResultInterface
      */
-    public function execute():ResultInterface
+    public function execute(): ResultInterface
     {
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
-        try {
-            $login = $this->_initLogin();
 
-            /* Log in */
+        try {
+            $login = $this->initLogin();
             $login->authenticateCustomer();
+
             $this->messageManager->addSuccessMessage(
                 __('You are logged in as customer: %1', $login->getCustomer()->getName())
             );
+            $resultRedirect->setPath('*/*/proceed');
+
         } catch (LocalizedException $e) {
             $this->messageManager->addErrorMessage($e->getMessage());
-
             $resultRedirect->setPath('/');
-            return $resultRedirect;
-
         } catch (\Exception $e) {
-            $this->messageManager->addErrorMessage($e->getMessage());
-        }
+            $this->logger->error($e->getMessage());
 
-        $resultRedirect->setPath('*/*/proceed');
+            $this->messageManager->addErrorMessage(__('Cannot login to account.'));
+            $resultRedirect->setPath('/');
+        }
         return $resultRedirect;
     }
 
     /**
      * Init login info
-     * @return \Magento\LoginAsCustomer\Model\Login
+     *
+     * @return Login
+     * @throws LocalizedException
      */
-    private function _initLogin(): \Magento\LoginAsCustomer\Model\Login
+    private function initLogin(): Login
     {
-        $secret = $this->getRequest()->getParam('secret');
+        $secret = $this->request->getParam('secret');
         if (!$secret) {
-            throw LocalizedException(__('Cannot login to account. No secret key provided.'));
+            throw new LocalizedException(__('Cannot login to account. No secret key provided.'));
         }
 
         $login = $this->loginModel->loadNotUsed($secret);
@@ -82,7 +117,7 @@ private function _initLogin(): \Magento\LoginAsCustomer\Model\Login
         if ($login->getId()) {
             return $login;
         } else {
-            throw LocalizedException(__('Cannot login to account. Secret key is not valid'));
+            throw new LocalizedException(__('Cannot login to account. Secret key is not valid'));
         }
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Controller/Login/Proceed.php b/app/code/Magento/LoginAsCustomer/Controller/Login/Proceed.php
index c5b2127133594..45e2c3f9ce921 100755
--- a/app/code/Magento/LoginAsCustomer/Controller/Login/Proceed.php
+++ b/app/code/Magento/LoginAsCustomer/Controller/Login/Proceed.php
@@ -4,26 +4,39 @@
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
+
 namespace Magento\LoginAsCustomer\Controller\Login;
 
 use Magento\Backend\Model\View\Result\Page;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
-use Magento\Framework\App\Action\Action;
 
 /**
  * Login as customer proxy page
  * Allows running JavaScript to load customer data to the browser local storage
  */
-class Proceed extends Action implements HttpGetActionInterface
+class Proceed implements HttpGetActionInterface
 {
+    /**
+     * @var ResultFactory
+     */
+    private $resultFactory;
+
+    /**
+     * @param ResultFactory $resultFactory
+     */
+    public function __construct(ResultFactory $resultFactory)
+    {
+        $this->resultFactory = $resultFactory;
+    }
+
     /**
      * Proxy page
      *
      * @return ResultInterface
      */
-    public function execute():ResultInterface
+    public function execute(): ResultInterface
     {
         /** @var Page $resultPage */
         $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
diff --git a/app/code/Magento/LoginAsCustomer/CustomerData/LoginAsCustomer.php b/app/code/Magento/LoginAsCustomer/CustomerData/LoginAsCustomer.php
index 56af5c948bf69..f7153dc6c2b75 100644
--- a/app/code/Magento/LoginAsCustomer/CustomerData/LoginAsCustomer.php
+++ b/app/code/Magento/LoginAsCustomer/CustomerData/LoginAsCustomer.php
@@ -13,6 +13,8 @@
 
 /**
  * Customer data for the logged_as_customer section
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class LoginAsCustomer implements SectionSourceInterface
 {
@@ -41,6 +43,7 @@ public function __construct(
 
     /**
      * Retrieve private customer data for the logged_as_customer section
+     *
      * @return array
      */
     public function getSectionData():array
@@ -50,8 +53,8 @@ public function getSectionData():array
         }
 
         return [
-            'admin_user_id' => $this->customerSession->getLoggedAsCustomerAdmindId(),
-            'website_name' => $this->storeManager->getWebsite()->getName()
+            'adminUserId' => $this->customerSession->getLoggedAsCustomerAdmindId(),
+            'websiteName' => $this->storeManager->getWebsite()->getName()
         ];
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Model/Config.php b/app/code/Magento/LoginAsCustomer/Model/Config.php
index e1b7bcfbcaa5a..7b34cc8dcfd7c 100644
--- a/app/code/Magento/LoginAsCustomer/Model/Config.php
+++ b/app/code/Magento/LoginAsCustomer/Model/Config.php
@@ -8,33 +8,32 @@
 namespace Magento\LoginAsCustomer\Model;
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Store\Model\ScopeInterface;
 
 /**
- * Class Config
+ * LoginAsCustomer module config model.
  */
 class Config
 {
     /**
      * Extension config path
      */
-    private const XML_PATH_EXTENSION_ENABLED     = 'mfloginascustomer/general/enabled';
-    private const XML_PATH_KEY                   = 'mfloginascustomer/general/key';
-    private const STORE_VIEW_TO_LOGIN_IN         = 'mfloginascustomer/general/store_view_login';
+    private const XML_PATH_EXTENSION_ENABLED = 'loginascustomer/general/enabled';
+    private const ENABLE_STORE_VIEW_MANUAL_CHOICE = 'loginascustomer/general/enable_store_view_manual_choice';
 
     /**
      * @var ScopeConfigInterface
      */
 
     private $scopeConfig;
+
     /**
      * @var \Magento\Framework\App\ProductMetadataInterface
      */
     private $metadata;
 
     /**
-     * Config constructor.
      * @param ScopeConfigInterface $scopeConfig
      * @param ProductMetadataInterface $metadata
      */
@@ -47,37 +46,30 @@ public function __construct(
     }
 
     /**
-     * Retrieve store config value
-     * @param string $path
-     * @param null $storeId
-     * @return mixed
-     */
-    public function getConfig($path, $storeId = null)
-    {
-        return $this->scopeConfig->getValue(
-            $path,
-            ScopeInterface::SCOPE_STORE,
-            $storeId
-        );
-    }
-
-    /**
+     * Check if Login As Customer extension is enabled.
+     *
      * @return bool
      */
-    public function isEnabled():bool
+    public function isEnabled(): bool
     {
-        return (bool)$this->getConfig(
-            self::XML_PATH_EXTENSION_ENABLED
+        return (bool)$this->scopeConfig->getValue(
+            self::XML_PATH_EXTENSION_ENABLED,
+            ScopeInterface::SCOPE_STORE,
+            null
         );
     }
 
     /**
+     * Check if store view manual choice is enabled.
+     *
      * @return bool
      */
-    public function getStoreViewLogin(): bool
+    public function isManualChoiceEnabled(): bool
     {
-        return (bool)$this->getConfig(
-            self::STORE_VIEW_TO_LOGIN_IN
+        return (bool)$this->scopeConfig->getValue(
+            self::ENABLE_STORE_VIEW_MANUAL_CHOICE,
+            ScopeInterface::SCOPE_STORE,
+            null
         );
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php b/app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php
index 913357eff6409..63aea9d8f05e3 100644
--- a/app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Model/PageCache/ConfigPlugin.php
@@ -9,6 +9,8 @@
 
 /**
  * Page cache config plugin
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class ConfigPlugin
 {
@@ -44,12 +46,14 @@ public function __construct(
      * @param \Magento\PageCache\Model\Config $subject
      * @param bool $result
      * @return bool
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterIsEnabled(\Magento\PageCache\Model\Config $subject, $result): bool
     {
         if ($result) {
+
             $disable = $this->_scopeConfig->getValue(
-                'mfloginascustomer/general/disable_page_cache',
+                'loginascustomer/general/disable_page_cache',
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $adminId = $this->_customerSession->getLoggedAsCustomerAdmindId();
diff --git a/app/code/Magento/LoginAsCustomer/Observer/WbsiterestrictionFrontendObserver.php b/app/code/Magento/LoginAsCustomer/Observer/WbsiterestrictionFrontendObserver.php
deleted file mode 100644
index 298282f69d7f4..0000000000000
--- a/app/code/Magento/LoginAsCustomer/Observer/WbsiterestrictionFrontendObserver.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-declare(strict_types=1);
-
-namespace Magento\LoginAsCustomer\Observer;
-
-use Magento\Framework\Event\ObserverInterface;
-
-/**
- * LoginAsCustomer observer
- */
-class WbsiterestrictionFrontendObserver implements ObserverInterface
-{
-    /**
-     * Disable website stub or private sales restriction for loginascustomer
-     * @param \Magento\Framework\Event\Observer $observer
-     * @return void
-     */
-    public function execute(\Magento\Framework\Event\Observer $observer): void
-    {
-        $controller = $observer->getController();
-        if ($controller->getRequest()->getModuleName() == 'loginascustomer') {
-            $result = $observer->getResult();
-            $result->setData('should_proceed', false);
-        }
-    }
-}
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
index e87e5553ef4c8..da6cbd4ef706b 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/AdminAddCommentOnOrderPlacementPlugin.php
@@ -39,16 +39,18 @@ public function __construct(
     public function afterPlace(Order $subject, Order $result): Order
     {
         $adminUser = $this->userSession->getUser();
-        $subject->addCommentToStatusHistory(
-            'Order Placed by Store Administrator',
-            false,
-            true
-        )->setIsCustomerNotified(false);
-        $subject->addCommentToStatusHistory(
-            "Order Placed by {$adminUser->getFirstName()} {$adminUser->getLastName()} using Admin Panel",
-            false,
-            false
-        )->setIsCustomerNotified(false);
+        if ($adminUser) {
+            $subject->addCommentToStatusHistory(
+                'Order Placed by Store Administrator',
+                false,
+                true
+            )->setIsCustomerNotified(false);
+            $subject->addCommentToStatusHistory(
+                "Order Placed by {$adminUser->getFirstName()} {$adminUser->getLastName()} using Admin Panel",
+                false,
+                false
+            )->setIsCustomerNotified(false);
+        }
 
         return $result;
     }
diff --git a/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php b/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php
index 20b0332ae76d2..64a0ad8a872a0 100644
--- a/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php
+++ b/app/code/Magento/LoginAsCustomer/Plugin/Button/ToolbarPlugin.php
@@ -7,14 +7,12 @@
 
 namespace Magento\LoginAsCustomer\Plugin\Button;
 
-use \Magento\LoginAsCustomerAdvanced\Controller\Adminhtml\Order\Login as LoginController;
-use \Magento\Backend\Block\Widget\Button\Toolbar\Interceptor;
-use \Magento\Framework\View\Element\AbstractBlock;
-use \Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\ButtonList;
+use Magento\Backend\Block\Widget\Button\Toolbar;
+use Magento\Framework\View\Element\AbstractBlock;
 
 /**
- * Class ToolbarPlugin
- * @package Magento\LoginAsCustomerAdvanced\Plugin\Button
+ * Plugin for \Magento\Backend\Block\Widget\Button\Toolbar.
  */
 class ToolbarPlugin
 {
@@ -42,12 +40,15 @@ public function __construct(
     }
 
     /**
-     * @param \Magento\Backend\Block\Widget\Button\Toolbar\Interceptor $subject
+     * Add Login As Customer button.
+     *
+     * @param \Magento\Backend\Block\Widget\Button\Toolbar $subject
      * @param \Magento\Framework\View\Element\AbstractBlock $context
      * @param \Magento\Backend\Block\Widget\Button\ButtonList $buttonList
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function beforePushButtons(
-        Interceptor $subject,
+        Toolbar $subject,
         AbstractBlock $context,
         ButtonList $buttonList
     ):void {
@@ -71,7 +72,11 @@ public function beforePushButtons(
                     ]);
                     $buttonList->add(
                         'guest_to_customer',
-                        ['label' => __('Login As Customer'), 'onclick' => 'window.open(\'' . $buttonUrl . '\')', 'class' => 'reset'],
+                        [
+                            'label' => __('Login As Customer'),
+                            'onclick' => 'window.open(\'' . $buttonUrl . '\')',
+                            'class' => 'reset'
+                        ],
                         -1
                     );
                 }
diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Customer/Edit/Login.php b/app/code/Magento/LoginAsCustomer/Ui/Customer/Component/Control/LoginAsCustomerButton.php
old mode 100755
new mode 100644
similarity index 67%
rename from app/code/Magento/LoginAsCustomer/Block/Adminhtml/Customer/Edit/Login.php
rename to app/code/Magento/LoginAsCustomer/Ui/Customer/Component/Control/LoginAsCustomerButton.php
index fe22450cda1ad..a37d8613e0019
--- a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Customer/Edit/Login.php
+++ b/app/code/Magento/LoginAsCustomer/Ui/Customer/Component/Control/LoginAsCustomerButton.php
@@ -5,60 +5,60 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Block\Adminhtml\Customer\Edit;
+namespace Magento\LoginAsCustomer\Ui\Customer\Component\Control;
 
 use Magento\Customer\Block\Adminhtml\Edit\GenericButton;
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Login as customer button
+ * Login As Customer button UI component.
  */
-class Login extends GenericButton implements ButtonProviderInterface
+class LoginAsCustomerButton extends GenericButton implements ButtonProviderInterface
 {
     /**
      * @var \Magento\Framework\AuthorizationInterface
      */
-    private $_authorization;
+    private $authorization;
 
     /**
-     * Constructor
-     *
      * @param \Magento\Backend\Block\Widget\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param AccountManagementInterface $customerAccountManagement
      */
     public function __construct(
         \Magento\Backend\Block\Widget\Context $context,
         \Magento\Framework\Registry $registry
     ) {
         parent::__construct($context, $registry);
-        $this->_authorization = $context->getAuthorization();
+        $this->authorization = $context->getAuthorization();
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function getButtonData(): array
     {
         $customerId = $this->getCustomerId();
         $data = [];
-        $canModify = $customerId && $this->_authorization->isAllowed('Magento_LoginAsCustomer::login_button');
+        $canModify = $customerId && $this->authorization->isAllowed('Magento_LoginAsCustomer::login_button');
         if ($canModify) {
             $data = [
                 'label' => __('Login As Customer'),
                 'class' => 'login login-button',
-                'on_click' => 'window.open( \'' . $this->getInvalidateTokenUrl() .
+                'on_click' => 'window.open( \'' . $this->getLoginUrl() .
                     '\')',
                 'sort_order' => 70,
             ];
         }
+
         return $data;
     }
 
     /**
+     * Get Login As Customer login url.
+     *
      * @return string
      */
-    public function getInvalidateTokenUrl(): string
+    public function getLoginUrl(): string
     {
         return $this->getUrl('loginascustomer/login/login', ['customer_id' => $this->getCustomerId()]);
     }
diff --git a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Store/SaveButton.php b/app/code/Magento/LoginAsCustomer/Ui/Store/Component/Control/LoginAsCustomerButton.php
old mode 100755
new mode 100644
similarity index 75%
rename from app/code/Magento/LoginAsCustomer/Block/Adminhtml/Store/SaveButton.php
rename to app/code/Magento/LoginAsCustomer/Ui/Store/Component/Control/LoginAsCustomerButton.php
index 1403c3bfb9de7..4d7aebc9c0d66
--- a/app/code/Magento/LoginAsCustomer/Block/Adminhtml/Store/SaveButton.php
+++ b/app/code/Magento/LoginAsCustomer/Ui/Store/Component/Control/LoginAsCustomerButton.php
@@ -5,16 +5,18 @@
  */
 declare(strict_types=1);
 
-namespace Magento\LoginAsCustomer\Block\Adminhtml\Store;
+namespace Magento\LoginAsCustomer\Ui\Store\Component\Control;
 
 use Magento\Framework\View\Element\UiComponent\Control\ButtonProviderInterface;
 
 /**
- * Class SaveButton
+ * Login As Customer button UI component.
  */
-class SaveButton implements ButtonProviderInterface
+class LoginAsCustomerButton implements ButtonProviderInterface
 {
     /**
+     * Get button data
+     *
      * @return array
      */
     public function getButtonData(): array
@@ -30,4 +32,3 @@ public function getButtonData(): array
         ];
     }
 }
-
diff --git a/app/code/Magento/LoginAsCustomer/Ui/DataProvider/Store/Form/StoreDataProvider.php b/app/code/Magento/LoginAsCustomer/Ui/Store/DataProvider/Form/StoreDataProvider.php
similarity index 87%
rename from app/code/Magento/LoginAsCustomer/Ui/DataProvider/Store/Form/StoreDataProvider.php
rename to app/code/Magento/LoginAsCustomer/Ui/Store/DataProvider/Form/StoreDataProvider.php
index a9316fb5e1504..f06458ed72e98 100644
--- a/app/code/Magento/LoginAsCustomer/Ui/DataProvider/Store/Form/StoreDataProvider.php
+++ b/app/code/Magento/LoginAsCustomer/Ui/Store/DataProvider/Form/StoreDataProvider.php
@@ -4,11 +4,15 @@
  * See COPYING.txt for license details.
  */
 declare(strict_types=1);
-namespace Magento\LoginAsCustomer\Ui\DataProvider\Store\Form;
+
+namespace Magento\LoginAsCustomer\Ui\Store\DataProvider\Form;
 
 use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
 use Magento\Ui\DataProvider\AbstractDataProvider;
 
+/**
+ * Login As Customer store view form data provider.
+ */
 class StoreDataProvider extends AbstractDataProvider
 {
     /**
@@ -30,5 +34,4 @@ public function __construct(
         $this->collection = $collectionFactory->create();
         parent::__construct($name, $primaryFieldName, $requestFieldName, $meta, $data);
     }
-
 }
diff --git a/app/code/Magento/LoginAsCustomer/composer.json b/app/code/Magento/LoginAsCustomer/composer.json
index 5b0ade832bbcd..71813cebf4581 100755
--- a/app/code/Magento/LoginAsCustomer/composer.json
+++ b/app/code/Magento/LoginAsCustomer/composer.json
@@ -2,14 +2,24 @@
     "name": "magento/module-login-as-customer",
     "description": "Allow for admin to enter a customer account",
     "require": {
+        "php": "~7.1.3||~7.2.0||~7.3.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
-        "magento/module-sales": "*",
+        "magento/module-checkout": "*",
         "magento/module-customer": "*",
-        "magento/module-checkout": "*"
+        "magento/module-sales": "*",
+        "magento/module-store": "*",
+        "magento/module-ui": "*",
+        "magento/module-user": "*"
+    },
+    "suggest": {
+        "magento/module-page-cache": "*"
     },
     "type": "magento2-module",
-    "version": "2.2.1",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
     "autoload": {
         "files": [ "registration.php" ],
         "psr-4": {
diff --git a/app/code/Magento/LoginAsCustomer/etc/adminhtml/system.xml b/app/code/Magento/LoginAsCustomer/etc/adminhtml/system.xml
index f807ec6d366ac..bfb90dc3413e7 100755
--- a/app/code/Magento/LoginAsCustomer/etc/adminhtml/system.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
-        <section id="mfloginascustomer" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
+        <section id="loginascustomer" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
             <class>separator-top</class>
             <label>Login As Customer</label>
             <tab>customer</tab>
@@ -23,7 +23,7 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment><![CDATA[If set to "Yes", when login as customer Page Cache will be disabled.]]></comment>
                 </field>
-                <field id="store_view_login" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable_store_view_manual_choice" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Store View To Login In</label>
                     <source_model>Magento\LoginAsCustomer\Model\Config\Source\StoreViewLogin</source_model>
                     <comment><![CDATA[
diff --git a/app/code/Magento/LoginAsCustomer/etc/config.xml b/app/code/Magento/LoginAsCustomer/etc/config.xml
index 0539870f1aa86..efc0b29748d5b 100755
--- a/app/code/Magento/LoginAsCustomer/etc/config.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/config.xml
@@ -7,10 +7,10 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
-        <mfloginascustomer>
+        <loginascustomer>
             <general>
                 <enabled>1</enabled>
             </general>
-        </mfloginascustomer>
+        </loginascustomer>
     </default>
 </config>
diff --git a/app/code/Magento/LoginAsCustomer/etc/frontend/di.xml b/app/code/Magento/LoginAsCustomer/etc/frontend/di.xml
index 5f0f784e051e3..1cf46eadddc2c 100755
--- a/app/code/Magento/LoginAsCustomer/etc/frontend/di.xml
+++ b/app/code/Magento/LoginAsCustomer/etc/frontend/di.xml
@@ -13,7 +13,7 @@
     <type name="Magento\Customer\CustomerData\SectionPoolInterface">
         <arguments>
             <argument name="sectionSourceMap" xsi:type="array">
-                <item name="logged_as_customer" xsi:type="string">Magento\LoginAsCustomer\CustomerData\LoginAsCustomer</item>
+                <item name="loggedAsCustomer" xsi:type="string">Magento\LoginAsCustomer\CustomerData\LoginAsCustomer</item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/LoginAsCustomer/etc/frontend/events.xml b/app/code/Magento/LoginAsCustomer/etc/frontend/events.xml
deleted file mode 100644
index 895bba76700b2..0000000000000
--- a/app/code/Magento/LoginAsCustomer/etc/frontend/events.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="websiterestriction_frontend">
-        <observer name="login_as_customer_website_restriction_frontend" instance="Magento\LoginAsCustomer\Observer\WbsiterestrictionFrontendObserver" />
-    </event>
-</config>
diff --git a/app/code/Magento/LoginAsCustomer/etc/webrestrictions.xml b/app/code/Magento/LoginAsCustomer/etc/webrestrictions.xml
deleted file mode 100644
index 5d909de63d123..0000000000000
--- a/app/code/Magento/LoginAsCustomer/etc/webrestrictions.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_WebsiteRestriction:etc/webrestrictions.xsd">
-    <action path="loginascustomer_login_index" type="generic" />
-    <action path="loginascustomer_login_proceed" type="generic" />
-</config>
diff --git a/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid.xml b/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid.xml
index 6f400c0e5c601..e298729b5422b 100755
--- a/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid.xml
+++ b/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid.xml
@@ -5,7 +5,7 @@
  * See COPYING.txt for license details.
  */
 -->
-<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etclayout_generic.xsd">
+<layout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/layout_generic.xsd">
     <update handle="formkey"/>
     <update handle="loginascustomer_login_grid_block"/>
     <container name="root">
diff --git a/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid_block.xml b/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid_block.xml
index 8f38fab2e2e7a..b75a5b0a68621 100755
--- a/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid_block.xml
+++ b/app/code/Magento/LoginAsCustomer/view/adminhtml/layout/loginascustomer_login_grid_block.xml
@@ -18,7 +18,7 @@
                 </arguments>
 
                 <block class="Magento\Backend\Block\Widget\Grid\ColumnSet" name="loginascustomer.grid.columnSet" as="grid.columnSet">
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="login_id">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.loginId" as="login_id">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">ID</argument>
                             <argument name="index" xsi:type="string">login_id</argument>
@@ -26,7 +26,7 @@
                             <argument name="column_css_class" xsi:type="string">col-id</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="customer_id">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.customerId" as="customer_id">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer ID</argument>
                             <argument name="index" xsi:type="string">customer_id</argument>
@@ -34,7 +34,7 @@
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="email">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.email" as="email">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Customer Email</argument>
                             <argument name="index" xsi:type="string">email</argument>
@@ -42,7 +42,7 @@
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="admin_id">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.adminId" as="admin_id">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Admin ID</argument>
                             <argument name="index" xsi:type="string">admin_id</argument>
@@ -50,7 +50,7 @@
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="username">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.username" as="username">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Admin Name</argument>
                             <argument name="index" xsi:type="string">username</argument>
@@ -58,7 +58,7 @@
                             <argument name="column_css_class" xsi:type="string">col-title</argument>
                         </arguments>
                     </block>
-                    <block class="Magento\Backend\Block\Widget\Grid\Column" as="created_at">
+                    <block class="Magento\Backend\Block\Widget\Grid\Column" name="loginascustomer.grid.columnSet.createdAt" as="created_at">
                         <arguments>
                             <argument name="header" xsi:type="string" translate="true">Logged In</argument>
                             <argument name="index" xsi:type="string">created_at</argument>
diff --git a/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/customer_form.xml b/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/customer_form.xml
index 82988c801ef7d..55cbb7e55cfa8 100755
--- a/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/customer_form.xml
+++ b/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/customer_form.xml
@@ -5,10 +5,12 @@
  * See COPYING.txt for license details.
  */
 -->
-<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
-    <argument name="data" xsi:type="array">
-        <item name="buttons" xsi:type="array">
-            <item name="login_as_customer" xsi:type="string">Magento\LoginAsCustomer\Block\Adminhtml\Customer\Edit\Login</item>
-        </item>
-    </argument>
+<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <settings>
+        <buttons>
+            <button name="login_as_customer"
+                    class="\Magento\LoginAsCustomer\Ui\Customer\Component\Control\LoginAsCustomerButton"/>
+        </buttons>
+    </settings>
 </form>
diff --git a/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/manual_store_form.xml b/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/manual_store_form.xml
index b324143a7294a..79f1a965f3ece 100644
--- a/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/manual_store_form.xml
+++ b/app/code/Magento/LoginAsCustomer/view/adminhtml/ui_component/manual_store_form.xml
@@ -15,7 +15,8 @@
     </argument>
     <settings>
         <buttons>
-            <button name="save" class="Magento\LoginAsCustomer\Block\Adminhtml\Store\SaveButton"/>
+            <button name="login_as_customer"
+                    class="Magento\LoginAsCustomer\Ui\Store\Component\Control\LoginAsCustomerButton"/>
         </buttons>
         <dataScope>data</dataScope>
         <deps>
@@ -26,7 +27,7 @@
         <settings>
             <submitUrl path="loginascustomer/login/login"/>
         </settings>
-        <dataProvider class="Magento\LoginAsCustomer\Ui\DataProvider\Store\Form\StoreDataProvider"
+        <dataProvider class="Magento\LoginAsCustomer\Ui\Store\DataProvider\Form\StoreDataProvider"
                       name="manual_store_form_data_source">
             <settings>
                 <requestFieldName>entity_id</requestFieldName>
@@ -35,40 +36,45 @@
         </dataProvider>
     </dataSource>
 
-    <fieldset name="websites" class="Magento\Store\Ui\Component\Form\Fieldset\Websites">
-        <argument name="data" xsi:type="array">
-            <item name="config" xsi:type="array">
-                <item name="collapsible" xsi:type="boolean">false</item>
-                <item name="label" xsi:type="string" translate="true">Stores</item>
-                <item name="sortOrder" xsi:type="number">50</item>
-            </item>
-        </argument>
-        <field name="entity_id">
+    <fieldset name="websites" class="Magento\Store\Ui\Component\Form\Fieldset\Websites" sortOrder="50">
+        <settings>
+            <label translate="true">Stores</label>
+            <collapsible>false</collapsible>
+        </settings>
+        <field name="entity_id" formElement="input">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
-                    <item name="visible" xsi:type="boolean">false</item>
-                    <item name="dataType" xsi:type="string">text</item>
-                    <item name="formElement" xsi:type="string">input</item>
                     <item name="source" xsi:type="string">page</item>
-                    <item name="dataScope" xsi:type="string">entity_id</item>
                 </item>
             </argument>
+            <settings>
+                <visible>false</visible>
+                <dataType>text</dataType>
+                <dataScope>entity_id</dataScope>
+            </settings>
         </field>
-        <field name="storeviews">
+        <field name="storeviews" formElement="select">
             <argument name="data" xsi:type="array">
-                <item name="options" xsi:type="object">Magento\Cms\Ui\Component\Listing\Column\Cms\Options</item>
                 <item name="config" xsi:type="array">
-                    <item name="dataType" xsi:type="string">int</item>
-                    <item name="label" xsi:type="string" translate="true">Store View</item>
-                    <item name="formElement" xsi:type="string">select</item>
                     <item name="source" xsi:type="string">page</item>
-                    <item name="dataScope" xsi:type="string">store_id</item>
                     <item name="default" xsi:type="string">0</item>
-                    <item name="validation" xsi:type="array">
-                        <item name="required-entry" xsi:type="boolean">true</item>
-                    </item>
                 </item>
             </argument>
+            <settings>
+                <label translate="true">Store View</label>
+                <dataType>int</dataType>
+                <dataScope>store_id</dataScope>
+                <validation>
+                    <rule name="required-entry" xsi:type="boolean">true</rule>
+                </validation>
+            </settings>
+            <formElements>
+                <select>
+                    <settings>
+                        <options class="Magento\Cms\Ui\Component\Listing\Column\Cms\Options"/>
+                    </settings>
+                </select>
+            </formElements>
         </field>
      </fieldset>
 </form>
diff --git a/app/code/Magento/LoginAsCustomer/view/frontend/web/js/view/loginAsCustomer.js b/app/code/Magento/LoginAsCustomer/view/frontend/web/js/view/loginAsCustomer.js
index 215148a7e7dec..7f6cad6ce3f2d 100644
--- a/app/code/Magento/LoginAsCustomer/view/frontend/web/js/view/loginAsCustomer.js
+++ b/app/code/Magento/LoginAsCustomer/view/frontend/web/js/view/loginAsCustomer.js
@@ -22,12 +22,12 @@ define([
             this._super();
 
             this.customer = customerData.get('customer');
-            this.loginAsCustomer = customerData.get('logged_as_customer');
-            this.isVisible(this.loginAsCustomer().admin_user_id);
+            this.loginAsCustomer = customerData.get('loggedAsCustomer');
+            this.isVisible(this.loginAsCustomer().adminUserId);
 
             this.notificationText = $.mage.__('You are connected as <strong>%1</strong> on %2')
                 .replace('%1', this.customer().fullname)
-                .replace('%2', this.loginAsCustomer().website_name);
+                .replace('%2', this.loginAsCustomer().websiteName);
         },
 
         /** @inheritdoc */
diff --git a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteGeneratedForMultipleStoreviewsDuringProductImportWithConfigTurnedOffTest.xml b/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteGeneratedForMultipleStoreviewsDuringProductImportWithConfigTurnedOffTest.xml
deleted file mode 100644
index f9003ce8c0897..0000000000000
--- a/app/code/Magento/UrlRewrite/Test/Mftf/Test/AdminCheckUrlRewritesCorrectlyGeneratedForMultipleStoreviewsDuringProductImportTest/AdminUrlRewriteGeneratedForMultipleStoreviewsDuringProductImportWithConfigTurnedOffTest.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="AdminUrlRewriteGeneratedForMultipleStoreviewsDuringProductImportWithConfigTurnedOffTest">
-        <annotations>
-            <features value="Url Rewrite"/>
-            <stories value="Url Rewrites for Multiple Storeviews"/>
-            <title value="Url Rewrites Correctly Generated for Multiple Storeviews During Product Import With Configuration Turned Off"/>
-            <description value="Check Url Rewrites Correctly Generated for Multiple Storeviews During Product Import."/>
-            <severity value="CRITICAL"/>
-            <testCaseId value="MC-6802"/>
-            <group value="urlRewrite"/>
-        </annotations>
-        <before>
-            <!-- Set the configuration for Generate "category/product" URL Rewrites to Yes (default)-->
-            <comment userInput="Enable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentEnableUrlRewriteConfig"/>
-            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="enableGenerateUrlRewrite"/>
-            <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache1"/>
-            <createData entity="ApiCategory" stepKey="createCategory">
-                <field key="name">category-admin</field>
-            </createData>
-            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
-            <!-- Create Store View EN -->
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewEn">
-                <argument name="customStore" value="customStoreENNotUnique"/>
-            </actionGroup>
-            <!-- Create Store View NL -->
-            <actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createStoreViewNl">
-                <argument name="customStore" value="customStoreNLNotUnique"/>
-            </actionGroup>
-            <!-- Set the configuration for Generate "category/product" URL Rewrites to No-->
-            <comment userInput="Disable SEO configuration setting to generate category/product URL Rewrites" stepKey="commentDisableUrlRewriteConfig"/>
-            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 0" stepKey="disableGenerateUrlRewrite"/>
-            <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache"/>
-        </before>
-        <after>
-            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewEn">
-                <argument name="customStore" value="customStoreENNotUnique"/>
-            </actionGroup>
-            <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewNl">
-                <argument name="customStore" value="customStoreNLNotUnique"/>
-            </actionGroup>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearStoreGridFilters"/>
-            <actionGroup ref="DeleteProductByNameActionGroup" stepKey="deleteImportedProduct">
-                <argument name="sku" value="productformagetwo68980"/>
-                <argument name="name" value="productformagetwo68980"/>
-            </actionGroup>
-            <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFiltersIfSet"/>
-            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
-            <magentoCLI command="config:set catalog/seo/generate_category_product_rewrites 1" stepKey="resetConfigurationSetting"/>
-            <!--Flush cache-->
-            <magentoCLI command="cache:flush" stepKey="cleanCache2"/>
-        </after>
-        <actionGroup ref="SwitchCategoryStoreViewActionGroup" stepKey="switchToStoreViewEn">
-            <argument name="Store" value="customStoreENNotUnique.name"/>
-            <argument name="CatName" value="$$createCategory.name$$"/>
-        </actionGroup>
-        <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValueENStoreView"/>
-        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-english" stepKey="changeNameField"/>
-        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader"/>
-        <actionGroup ref="ChangeSeoUrlKeyForSubCategoryActionGroup" stepKey="changeSeoUrlKeyENStoreView">
-            <argument name="value" value="category-english"/>
-        </actionGroup>
-        <actionGroup ref="SwitchCategoryStoreViewActionGroup" stepKey="switchToStoreViewNl">
-            <argument name="Store" value="customStoreNLNotUnique.name"/>
-            <argument name="CatName" value="$$createCategory.name$$"/>
-        </actionGroup>
-        <uncheckOption selector="{{AdminCategoryBasicFieldSection.categoryNameUseDefault}}" stepKey="uncheckUseDefaultValue1"/>
-        <fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="category-dutch" stepKey="changeNameFieldNLStoreView"/>
-        <click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSectionHeader2"/>
-        <actionGroup ref="ChangeSeoUrlKeyForSubCategoryActionGroup" stepKey="changeSeoUrlKeyNLStoreView">
-            <argument name="value" value="category-dutch"/>
-        </actionGroup>
-        <amOnPage url="{{AdminImportIndexPage.url}}" stepKey="navigateToSystemImport"/>
-        <selectOption selector="{{AdminImportMainSection.entityType}}" userInput="Products" stepKey="selectProductsOption"/>
-        <waitForElementVisible selector="{{AdminImportMainSection.importBehavior}}" stepKey="waitForImportBehaviorElementVisible"/>
-        <selectOption selector="{{AdminImportMainSection.importBehavior}}" userInput="Add/Update" stepKey="selectAddUpdateOption"/>
-        <attachFile selector="{{AdminImportMainSection.selectFileToImport}}" userInput="import_updated.csv" stepKey="attachFileForImport"/>
-        <click selector="{{AdminImportHeaderSection.checkDataButton}}" stepKey="clickCheckDataButton"/>
-        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Checked rows: 3, checked entities: 1, invalid rows: 0, total errors: 0" stepKey="assertNotice"/>
-        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="File is valid! To start import process press &quot;Import&quot; button" stepKey="assertSuccessMessage"/>
-        <click selector="{{AdminImportMainSection.importButton}}" stepKey="clickImportButton"/>
-        <see selector="{{AdminImportValidationMessagesSection.success}}" userInput="Import successfully done" stepKey="assertSuccessMessage1"/>
-        <see selector="{{AdminImportValidationMessagesSection.notice}}" userInput="Created: 1, Updated: 0, Deleted: 0" stepKey="assertNotice1"/>
-        <actionGroup ref="SearchForProductOnBackendByNameActionGroup" stepKey="searchForProductOnBackend">
-            <argument name="productName" value="productformagetwo68980"/>
-        </actionGroup>
-        <click selector="{{AdminProductGridSection.productRowBySku('productformagetwo68980')}}" stepKey="clickOnProductRow"/>
-        <grabFromCurrentUrl regex="~/id/(\d+)/~" stepKey="grabProductIdFromUrl"/>
-        <amOnPage url="{{AdminUrlRewriteIndexPage.url}}" stepKey="goToUrlRewritesIndexPage"/>
-
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters"/>
-        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="category-english.html" stepKey="inputCategoryUrlForENStoreView"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters"/>
-        <waitForPageLoad stepKey="waitForPageToLoad"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-english.html')}}" stepKey="seeUrlInRequestPathColumn"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn"/>
-
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
-        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="category-dutch.html" stepKey="inputCategoryUrlForNLStoreView"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad1"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-dutch.html')}}" stepKey="seeUrlInRequestPathColumn1"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/category/view/id/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn1"/>
-
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters2"/>
-        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="productformagetwo68980-english.html" stepKey="inputProductUrlForENStoreView"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters2"/>
-        <waitForPageLoad stepKey="waitForPageToLoad2"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn2"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', 'catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn2"/>
-        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-english/productformagetwo68980-english.html')}}" stepKey="seeUrlInRequestPathColumn4"/>
-        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn4"/>
-
-        <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters3"/>
-        <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="productformagetwo68980-dutch.html" stepKey="inputProductUrlForENStoreView1"/>
-        <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters3"/>
-        <waitForPageLoad stepKey="waitForPageToLoad3"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn3"/>
-        <seeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', 'catalog/product/view/id/$grabProductIdFromUrl')}}" stepKey="seeUrlInTargetPathColumn3"/>
-        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Request Path', 'category-dutch/productformagetwo68980-dutch.html')}}" stepKey="seeUrlInRequestPathColumn5"/>
-        <dontSeeElement selector="{{AdminUrlRewriteIndexSection.gridCellByColumnValue('Target Path', catalog/product/view/id/$grabProductIdFromUrl/category/$$createCategory.id$$)}}" stepKey="seeUrlInTargetPathColumn5"/>
-
-        <!-- Switch StoreView -->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page"/>
-        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView">
-            <argument name="storeView" value="customStoreENNotUnique"/>
-        </actionGroup>
-
-        <amOnPage url="/productformagetwo68980-english.html" stepKey="navigateToProductPage"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="productformagetwo68980-english" stepKey="seeProductName"/>
-        <amOnPage url="/category-english/productformagetwo68980-english.html" stepKey="navigateToProductPage2"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="productformagetwo68980-english" stepKey="seeProductName2"/>
-
-        <!-- Switch StoreView -->
-        <amOnPage url="{{StorefrontHomePage.url}}" stepKey="amOnProduct4Page2"/>
-        <actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="switchToCustomStoreView2">
-            <argument name="storeView" value="customStoreNLNotUnique"/>
-        </actionGroup>
-
-        <amOnPage url="/productformagetwo68980-dutch.html" stepKey="navigateToProductPage3"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="productformagetwo68980-dutch" stepKey="seeProductName3"/>
-        <amOnPage url="/category-dutch/productformagetwo68980-dutch.html" stepKey="navigateToProductPage4"/>
-        <see selector="{{StorefrontProductInfoMainSection.productName}}" userInput="productformagetwo68980-dutch" stepKey="seeProductName4"/>
-    </test>
-</tests>